X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=f62c282340eee1ae7a5098ea6a2a060ce089c3ff;hb=206524a32e769b40cd66b33b5468d3a64a9b5b4a;hp=ad520c37aef7da7b64818dd77870cb8b857b77e9;hpb=18e0a83f5c21c8f764f558784006c974bfc024e1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index ad520c37a..f62c28234 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,33 +6,33 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -40,7 +40,39 @@ view "AF" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -50,33 +82,33 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -84,7 +116,39 @@ view "AN" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -94,33 +158,33 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -128,7 +192,39 @@ view "AS" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -138,33 +234,33 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -172,7 +268,39 @@ view "EU" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -182,33 +310,33 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -216,7 +344,39 @@ view "NA" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -226,33 +386,33 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -260,7 +420,39 @@ view "OC" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -270,9 +462,41 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -280,15 +504,23 @@ view "SA" {
 
   zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -296,7 +528,43 @@ view "SA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "archive.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp-upcoming.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -304,7 +572,39 @@ view "SA" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -314,33 +614,33 @@ view "SA" {
 view "default" {
   match-clients { any; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -348,7 +648,39 @@ view "default" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "www.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };