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 13603f2c8489e6e5426e6ce33c76834bcd6a7a84..e73132781dd47bd23ea4c88efd8694081f78a2d5 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,17 +6,17 @@
 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 "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -30,33 +30,41 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
     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.AF";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
     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.AF";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    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 { };
@@ -66,17 +74,17 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -90,33 +98,41 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
     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.AN";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
     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.AN";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    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 { };
@@ -126,17 +142,17 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -150,33 +166,41 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
     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.AS";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
     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.AS";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    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 { };
@@ -186,17 +210,17 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -210,33 +234,41 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
     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.EU";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
     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.EU";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    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 { };
@@ -246,17 +278,17 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -270,33 +302,41 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
     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.NA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
     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.NA";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    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 { };
@@ -306,17 +346,17 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -330,33 +370,41 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
     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.OC";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
     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.OC";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    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 { };
@@ -366,17 +414,17 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -390,33 +438,41 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
     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.SA";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
     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.SA";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -426,17 +482,17 @@ view "SA" {
 view "undef" {
   match-clients { undef; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -450,33 +506,41 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "snapshot.debian.org" {
+  zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
     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.undef";
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
     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.undef";
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "packages.debian.org" {
+  zone "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    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 { };
@@ -486,17 +550,17 @@ view "undef" {
 view "default" {
   match-clients { any; };
 
-  zone "volatile.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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/zonefiles/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -510,33 +574,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 "static.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    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 { };