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

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index a5b2c61c8..2f73886cc 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -30,6 +30,14 @@ 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";
@@ -62,14 +70,6 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -106,6 +106,14 @@ 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";
@@ -138,14 +146,6 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -182,6 +182,14 @@ 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";
@@ -214,14 +222,6 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -258,6 +258,14 @@ 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";
@@ -290,14 +298,6 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -334,6 +334,14 @@ 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";
@@ -366,14 +374,6 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -410,6 +410,14 @@ 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";
@@ -442,14 +450,6 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -486,6 +486,14 @@ 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";
@@ -518,14 +526,6 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -562,6 +562,14 @@ 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";
@@ -594,14 +602,6 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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";
@@ -638,6 +638,14 @@ 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";
@@ -670,14 +678,6 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
-    type master;
-    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";