From: Stephen Gran <steve@lobefin.net>
Date: Thu, 7 Apr 2011 18:49:05 +0000 (+0100)
Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dc0e232ad10ceea5b64f7da7cfdb8569ed64486a;hp=e3de8c8c9529d4e0ebe926c3f83b39f915ba3f41;p=mirror%2Fdsa-puppet.git

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

diff --git a/modules/named/files/common/named.conf.debian-zones b/modules/named/files/common/named.conf.debian-zones
index e377d104b..04e11de28 100644
--- a/modules/named/files/common/named.conf.debian-zones
+++ b/modules/named/files/common/named.conf.debian-zones
@@ -146,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;
@@ -160,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" {