X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=63512d5a418070893de0c8c705832be8306217da;hb=7a6e0fd9840f072852557a25b1560ab4c17111d6;hp=13603f2c8489e6e5426e6ce33c76834bcd6a7a84;hpb=e4f97bb49efdfe59162c033e1dbf7439d588bffe;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 13603f2c8..63512d5a4 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,17 +6,33 @@
 view "AF" {
   match-clients { AF; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp-upcoming.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -30,6 +46,22 @@ view "AF" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -38,9 +70,9 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -54,29 +86,37 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "AN" {
+  match-clients { AN; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "AN" {
-  match-clients { AN; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -90,6 +130,22 @@ view "AN" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -98,9 +154,9 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -114,29 +170,37 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "AS" {
+  match-clients { AS; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "AS" {
-  match-clients { AS; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -150,6 +214,22 @@ view "AS" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -158,9 +238,9 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -174,29 +254,37 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "EU" {
+  match-clients { EU; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "EU" {
-  match-clients { EU; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -210,6 +298,22 @@ view "EU" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -218,9 +322,9 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -234,29 +338,37 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "NA" {
+  match-clients { NA; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "NA" {
-  match-clients { NA; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -270,6 +382,22 @@ view "NA" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -278,9 +406,9 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -294,29 +422,37 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "OC" {
+  match-clients { OC; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "OC" {
-  match-clients { OC; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -330,6 +466,22 @@ view "OC" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -338,9 +490,9 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -354,29 +506,37 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "SA" {
+  match-clients { SA; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "SA" {
-  match-clients { SA; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -390,6 +550,22 @@ view "SA" {
     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 { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "snapshot.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
@@ -398,9 +574,9 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -414,29 +590,37 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "undef" {
-  match-clients { undef; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -450,6 +634,22 @@ view "undef" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    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";
@@ -458,9 +658,9 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -474,29 +674,37 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+};
+view "default" {
+  match-clients { any; };
+
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-};
-view "default" {
-  match-clients { any; };
+  zone "backports.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -510,33 +718,41 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };