X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=e73132781dd47bd23ea4c88efd8694081f78a2d5;hb=1f3dfc15f637fbc071a90af9872b871792e7a6c7;hp=63512d5a418070893de0c8c705832be8306217da;hpb=3561e0cdfcd7bb773c6431f56409002f632ad083;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 63512d5a4..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,9 +54,9 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -98,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";
@@ -114,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";
@@ -154,9 +122,9 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -182,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";
@@ -198,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";
@@ -238,9 +190,9 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -266,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";
@@ -282,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";
@@ -322,9 +258,9 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -350,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";
@@ -366,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";
@@ -406,9 +326,9 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -434,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";
@@ -450,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";
@@ -490,9 +394,9 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -518,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";
@@ -534,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";
@@ -574,9 +462,9 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -602,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";
@@ -618,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";
@@ -658,9 +530,9 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -686,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";
@@ -702,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";
@@ -742,9 +598,9 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };