X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.debian-zones.erb;h=910735b175aabdfb9588e82654013fea0d0818d7;hb=53b3217b7d9cfb135b06ecd39075b00bb58944b2;hp=d48e69e52f5899413b5a6ad7be591df8b2d17183;hpb=61eee0d8a2009be371e702b2f3013dc121d61a73;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 d48e69e52..910735b17 100644
--- a/modules/named/templates/named.conf.debian-zones.erb
+++ b/modules/named/templates/named.conf.debian-zones.erb
@@ -10,8 +10,17 @@ zones = []
 
 zones << "debian.org"
 zones << "debian.net"
-zones << "mirror.debian.net"
 zones << "debian.com"
+zones << "debian.ch"
+zones << "debian.es"
+zones << "debian.eu"
+zones << "debian.li"
+zones << "debian.gr"
+zones << "debian.us"
+zones << "debian.org.tw"
+
+zones << "debconf13.ch"
+zones << "debian-ports.org"
 
 # debian rack with sil.at
 zones << "144-28.118.59.86.in-addr.arpa"
@@ -21,19 +30,19 @@ 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"
 
-# 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC/ECE
+# 16.87.209.in-addr.arpa zone - reverse zone for 209.87.16/24 - debian at UBC
+zones << "16.87.209.in-addr.arpa"
+
+# 1.0.0.0.4.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:614:1::/64 - debian at UBC
+zones << "1.0.0.0.4.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa"
+
+# 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC ECE
 zones << "19.12.206.in-addr.arpa"
 
-# 0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:0610:4000::/64 - ubcece6
+# 0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa - reverse zone for 2607:f8f0:0610:4000::/64 - debian at UBC ECE
 zones << "0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa"
 
 # 0.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa - reverse for 2001:a78:5:0::/64 (villa)
@@ -45,6 +54,18 @@ zones << "1.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa"
 # 0.0.0.4.6.0.2.0.0.3.6.0.1.0.0.2.ip6.arpa - reverse for 2001:630:206:4000::/64 (sanger)
 zones << "0.0.0.4.6.0.2.0.0.3.6.0.1.0.0.2.ip6.arpa"
 
+# debian rack with manda
+zones << "64-26.75.195.82.in-addr.arpa"
+zones << "2.0.2.0.8.b.1.4.1.0.0.2.ip6.arpa"
+
+# 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"
+
+
 zones.each do |zone|
 -%>
 
@@ -53,10 +74,8 @@ zone "<%= zone %>" {
 	notify no;
 	file "db.<%= zone %>";
 	masters {
-		194.177.211.209; // orff
-		2001:648:2ffc:deb:213:72ff:fe69:e188; // orff
-		82.195.75.106; // draghi (backup master - requires manual reconfiguration on draghi)
-		2001:41b8:202:deb:216:36ff:fe40:3906; // draghi (see above)
+		82.195.75.91; // denis
+		2001:41b8:202:deb:1b1b::91; // denis
 	};
 	allow-query { any; };
 	allow-transfer { };
@@ -71,7 +90,7 @@ zone "alioth.debian.org" {
 	notify no;
 	file "db.alioth.debian.org";
 	masters {
-		217.196.43.132;
+		5.153.231.21;
 	};
 	allow-query { any; };
 	allow-transfer { };