X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnamed%2Ftemplates%2Fnamed.conf.debian-zones.erb;h=cadfaa54636c41b20ee619e822e899c4f76abaa8;hb=eb83f1b0de642f3741cf54fb6411f398f23489d5;hp=353e430d91d973b39a2d265025e5ce06d80c5aca;hpb=4ca38cd331c6c1ab74bf3d8afc5883d22d918ce5;p=dsa-puppet.git

diff --git a/modules/named/templates/named.conf.debian-zones.erb b/modules/named/templates/named.conf.debian-zones.erb
index 353e430d..cadfaa54 100644
--- a/modules/named/templates/named.conf.debian-zones.erb
+++ b/modules/named/templates/named.conf.debian-zones.erb
@@ -10,13 +10,17 @@ zones = []
 
 zones << "debian.org"
 zones << "debian.net"
-zones << "mirror.debian.net"
 zones << "debian.com"
-zones << "debian.eu"
-
 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"
@@ -26,12 +30,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,12 +52,30 @@ 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"
 
+# debconf 15 reverse dns
+zones << "64.70.141.in-addr.arpa"
+zones << "65.70.141.in-addr.arpa"
+zones << "66.70.141.in-addr.arpa"
+zones << "67.70.141.in-addr.arpa"
+zones << "68.70.141.in-addr.arpa"
+zones << "69.70.141.in-addr.arpa"
+zones << "70.70.141.in-addr.arpa"
+zones << "71.70.141.in-addr.arpa"
+zones << "72.70.141.in-addr.arpa"
+zones << "73.70.141.in-addr.arpa"
+zones << "74.70.141.in-addr.arpa"
+zones << "75.70.141.in-addr.arpa"
+zones << "76.70.141.in-addr.arpa"
+zones << "77.70.141.in-addr.arpa"
+zones << "78.70.141.in-addr.arpa"
+zones << "79.70.141.in-addr.arpa"
 
 zones.each do |zone|
 -%>
@@ -69,10 +85,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 { };
@@ -87,7 +101,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 { };