X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=e73132781dd47bd23ea4c88efd8694081f78a2d5;hb=757a3f72fd630ed38e2f5da4c16825ba6d41cce3;hp=2f73886cc69be7042fbcd5ed357854c570850f20;hpb=f594cb25e68f559671190cf143d531196d19bd05;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 2f73886cc..e73132781 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -14,14 +14,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    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";
@@ -30,14 +22,6 @@ view "AF" {
     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 { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
@@ -70,6 +54,14 @@ view "AF" {
     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";
@@ -90,14 +82,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
@@ -106,14 +90,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
@@ -146,6 +122,14 @@ view "AN" {
     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";
@@ -166,14 +150,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
@@ -182,14 +158,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
@@ -222,6 +190,14 @@ view "AS" {
     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";
@@ -242,14 +218,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
@@ -258,14 +226,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
@@ -298,6 +258,14 @@ view "EU" {
     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";
@@ -318,14 +286,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
@@ -334,14 +294,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
@@ -374,6 +326,14 @@ view "NA" {
     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";
@@ -394,14 +354,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
@@ -410,14 +362,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
@@ -450,6 +394,14 @@ view "OC" {
     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";
@@ -470,14 +422,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.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";
@@ -486,14 +430,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    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";
@@ -526,6 +462,14 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
@@ -546,14 +490,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.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";
@@ -562,14 +498,6 @@ view "undef" {
     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";
@@ -602,6 +530,14 @@ view "undef" {
     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";
@@ -622,14 +558,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "backports.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.backports.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
@@ -638,14 +566,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "ftp-upcoming.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
-    notify no;
-    allow-query { any; };
-    allow-transfer { };
-  };
-
   zone "ftp.debian.org" {
     type master;
     file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
@@ -678,6 +598,14 @@ view "default" {
     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";