clean up old, commented out stuff

[dsa-puppet.git] / modules / named / files / common / named.conf.debian-zones

diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones
index 72fe16267a6a77410456b0d090c22bfb3fcfead0..0dd0b1f796cb0c7e50d438838ae91a05b94d9912 100644 (file)
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -3,15 +3,17 @@
 // USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 //
 
-// Slave domains, includ in bind.conf
+// Slave domains, include in bind.conf
 
 zone "debian.org" {
        type slave;
        notify no;
        file "db.debian.org";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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)
        };
        allow-query { any; };
        allow-transfer { };
@@ -22,8 +24,10 @@ zone "debian.net" {
        notify no;
        file "db.debian.net";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
@@ -34,133 +38,215 @@ zone "mirror.debian.net" {
        notify no;
        file "db.mirror.debian.net";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
-zone "rbl.debian.net" {
+zone "debian.com" {
        type slave;
        notify no;
-       file "db.rbl.debian.net";
+       file "db.debian.com";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
-zone "debian.com" {
+// debian rack with sil.at
+zone "144-28.118.59.86.in-addr.arpa" {
        type slave;
        notify no;
-       file "db.debian.com";
+       file "db.86.59.118.144";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
-
-zone "alioth.debian.org" {
+zone "2.0.0.0.2.0.0.0.8.5.8.0.1.0.0.2.ip6.arpa" {
        type slave;
        notify no;
-       file "db.alioth.debian.org";
+       file "db.2001:0858:0002:0002";
        masters {
-               217.196.43.134;
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
-
-// debian rack with sil.at
-zone "144-28.118.59.86.in-addr.arpa" {
+// debian rack with grnet
+zone "192-27.211.177.194.in-addr.arpa" {
        type slave;
        notify no;
-       file "db.86.59.118.144";
+       file "db.194.177.211.192-27";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
-zone "2.0.0.0.2.0.0.0.8.5.8.0.1.0.0.2.ip6.arpa" {
+zone "b.e.d.0.c.f.f.2.8.4.6.0.1.0.0.2.ip6.arpa" {
        type slave;
        notify no;
-       file "db.2001:0858:0002:0002";
+       file "db.2001:0648:2ffc:0deb";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
+
 // ipv6 at 1&1 - powell: 2001:08d8:0081:1520::/60
 zone "2.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
        type slave;
        notify no;
        file "db.2001:08d8:0081:1520";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
-// ipv6 at 1&1 - puccini 2001:08d8:0081:15a0::/60
-zone "a.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
+zone "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" {
        type slave;
        notify no;
-       file "db.2001:08d8:0081:15a0";
+       file "db.2001:8d8:2:1:6564:0a62";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
-// ipv6 at 1&1 - wieck and schumann
-zone "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
+zone "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" {
        type slave;
        notify no;
-       file "db.2001:8d8:2:1:6564:0a62";
+       file "db.2001:8d8:580:400:6564:a62";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
-// ipv6 at xs4all - klecker 2001:888:2000:12::/64
-zone "2.1.0.0.0.0.0.2.8.8.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
+zone "19.12.206.in-addr.arpa" {
        type slave;
        notify no;
-       file "db.2001:888:2000:12";
+       file "db.206.12.19";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
 
-// 19.12.206.in-addr.arpa zone - reverse zone for 206.12.19/24 - debian at UBC/ECE
-zone "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
+zone "0.0.0.4.0.1.6.0.0.f.8.f.7.0.6.2.ip6.arpa" {
        type slave;
        notify no;
-       file "db.206.12.19";
+       file "db.2607:f8f0:0610:4000";
+       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
+       };
+       allow-query { any; };
+       allow-transfer { };
+};
+
+// 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)
+zone "0.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa" {
+       type slave;
+       notify no;
+       file "db.2001:0a78:0005:0000";
        masters {
-               82.195.75.106; // draghi
-               2001:41b8:202:deb:216:36ff:fe40:3906; //draghi
+               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
        };
        allow-query { any; };
        allow-transfer { };
 };
+
+// 1.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa - reverse for 2001:a78:5:1::/64 (lobos)
+zone "1.0.0.0.5.0.0.0.8.7.a.0.1.0.0.2.ip6.arpa" {
+       type slave;
+       notify no;
+       file "db.2001:0a78:0005:0001";
+       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
+       };
+       allow-query { any; };
+       allow-transfer { };
+};
+
+// 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)
+zone "0.0.0.4.6.0.2.0.0.3.6.0.1.0.0.2.ip6.arpa" {
+       type slave;
+       notify no;
+       file "db.2001:0630:0206:4000";
+       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
+       };
+       allow-query { any; };
+       allow-transfer { };
+};
+
+
+zone "alioth.debian.org" {
+       type slave;
+       notify no;
+       file "db.alioth.debian.org";
+       masters {
+               217.196.43.132;
+       };
+       allow-query { any; };
+       allow-transfer { };
+};
+
+
 // vim:set syn=named: