Remove ftp-upcoming

[dsa-puppet.git] / modules / named / files / common / named.conf.geo

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index d99b01650ad2c05ceffdbc57b5ed08ca921e3e6f..e73132781dd47bd23ea4c88efd8694081f78a2d5 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -14,57 +14,57 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -82,57 +82,57 @@ view "AN" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -150,57 +150,57 @@ view "AS" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -218,57 +218,57 @@ view "EU" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -286,57 +286,57 @@ view "NA" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -354,57 +354,57 @@ view "OC" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -422,57 +422,57 @@ view "SA" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.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.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -490,57 +490,57 @@ view "undef" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -558,57 +558,57 @@ view "default" {
     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.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "ftp.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "security.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "snapshot.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.static.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };