X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.debian-zones.erb;h=754acd0c2f55662e51f1a100592417be84c62f55;hb=86be210c825f8b9709e3bd9353c469949d918fda;hp=4d12387fee390e0ae661fb505b88ea998f8cb67f;hpb=f89a4063a0e80783cf3e27949439c661baef50e2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/templates/named.conf.debian-zones.erb b/modules/named/templates/named.conf.debian-zones.erb
index 4d12387fe..754acd0c2 100644
--- a/modules/named/templates/named.conf.debian-zones.erb
+++ b/modules/named/templates/named.conf.debian-zones.erb
@@ -13,6 +13,7 @@ zones << "debian.net"
 zones << "mirror.debian.net"
 zones << "debian.com"
 zones << "debian.eu"
+zones << "debian.us"
 
 zones << "debian.ch"
 zones << "debian.li"
@@ -26,12 +27,6 @@ zones << "2.0.0.0.2.0.0.0.8.5.8.0.1.0.0.2.ip6.arpa"
 zones << "192-27.211.177.194.in-addr.arpa"
 zones << "b.e.d.0.c.f.f.2.8.4.6.0.1.0.0.2.ip6.arpa"
 
-# ipv6 at 1&1 - powell: 2001:08d8:0081:1520::/60
-zones << "2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
-
-# ipv6 at 1&1 - wieck and schumann  - old range April 2011
-zones << "2.6.a.0.4.6.5.6.1.0.0.0.2.0.0.0.8.d.8.0.1.0.0.2.ip6.arpa"
-
 # ipv6 at 1&1 - wieck and schumann  - new range April 2011
 zones << "2.6.a.0.4.6.5.6.0.0.4.0.0.8.5.0.8.d.8.0.1.0.0.2.ip6.arpa"
 
@@ -54,8 +49,9 @@ zones << "0.0.0.4.6.0.2.0.0.3.6.0.1.0.0.2.ip6.arpa"
 zones << "64-26.75.195.82.in-addr.arpa"
 zones << "2.0.2.0.8.b.1.4.1.0.0.2.ip6.arpa"
 
-# 231.153.5.in-addr.arpa zone - reverse zone for 5.153.231.0/24 - debian at bytemark
+# reverse zone for 5.153.231.0/24 and 2001:41c8:1000::/48 - debian at bytemark
 zones << "231.153.5.in-addr.arpa"
+zones << "0.0.0.1.8.c.1.4.1.0.0.2.ip6.arpa"
 
 # various reverse zones for private networks
 zones << "29.172.in-addr.arpa"
@@ -93,24 +89,3 @@ zone "alioth.debian.org" {
 	allow-transfer { };
 };
 
-
-zone "10.in-addr.arpa"      { type master; file "/etc/bind/db.empty"; };
-
-zone "16.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "17.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "18.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "19.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "20.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "21.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "22.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "23.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "24.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "25.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "26.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "27.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "28.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-// zone "29.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "30.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-zone "31.172.in-addr.arpa"  { type master; file "/etc/bind/db.empty"; };
-
-zone "168.192.in-addr.arpa" { type master; file "/etc/bind/db.empty"; };