Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/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 a3a3977..04e11de 100644 (file)
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -47,20 +47,6 @@ zone "mirror.debian.net" {
        allow-transfer { };
 };
 
-zone "rbl.debian.net" {
-       type slave;
-       notify no;
-       file "db.rbl.debian.net";
-       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 "debian.com" {
        type slave;
        notify no;
@@ -160,7 +146,7 @@ zone "a.5.1.1.8.0.0.8.d.8.0.1.0.0.2.ip6.arpa" {
        allow-query { any; };
        allow-transfer { };
 };
-// ipv6 at 1&1 - wieck and schumann
+// 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;
@@ -174,6 +160,20 @@ 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" {
        allow-query { any; };
        allow-transfer { };
 };
+// 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:580:400:6564:a62";
+       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 { };
+};
 
 // 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" {