X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=475d4036406fee4a1337843297247a7fafbd846f;hb=7a0b5ea7181cc3ddfc465423a7e51f04ee4c2a97;hp=80cbe527d49bc3cd02c7422978aac3c3b5a09cf9;hpb=3a45f835c38ec513717c583b7467f30e21dec4d4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 80cbe527d..475d40364 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -1,4 +1,4 @@
-// This file was created by dsa-geodomains/zonebuilder --create-named-conf
+// This file was created by auto-dns/build-zones --create-named-conf
 // and is distributed to hosts using puppet as
 // dsa-puppet/modules/geodns/files/common/named.conf.geo
 // you probably do not want to edit it manually wherever you find it
@@ -6,49 +6,9 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -56,15 +16,7 @@ view "AF" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -74,49 +26,9 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -124,15 +36,7 @@ view "AN" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -142,49 +46,9 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -192,15 +56,7 @@ view "AS" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -210,49 +66,9 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -260,15 +76,7 @@ view "EU" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -278,49 +86,9 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -328,15 +96,7 @@ view "NA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -346,49 +106,9 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -396,15 +116,7 @@ view "OC" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -414,49 +126,9 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -464,15 +136,7 @@ view "SA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -482,49 +146,9 @@ view "SA" {
 view "undef" {
   match-clients { undef; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -532,15 +156,7 @@ view "undef" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.undef";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -550,49 +166,9 @@ view "undef" {
 view "default" {
   match-clients { any; };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.volatile.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "security.geo.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.security.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "ftp.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.ftp.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "snapshot.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.snapshot.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "bugs.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -600,15 +176,7 @@ view "default" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
-  zone "packages.debian.org" {
-    type master;
-    file "/etc/bind/geodns/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };