Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[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 13f6836e73e74427937b47eae41d1dd2a73bc168..57fe21996a5d1394e79937ae401caf57107dd42f 100644 (file)
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,6 +6,14 @@
 view "AF" {
   match-clients { AF; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AF";
@@ -22,17 +30,17 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/db.ftp.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
+    file "/etc/bind/geodns/db.bugs.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -58,6 +66,14 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AN";
@@ -74,17 +90,17 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/db.ftp.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
+    file "/etc/bind/geodns/db.bugs.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -110,6 +126,14 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.AS";
@@ -126,17 +150,17 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/db.ftp.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
+    file "/etc/bind/geodns/db.bugs.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -162,6 +186,14 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.EU";
@@ -178,17 +210,17 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/db.ftp.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
+    file "/etc/bind/geodns/db.bugs.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -214,6 +246,14 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.NA";
@@ -230,17 +270,17 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/db.ftp.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
+    file "/etc/bind/geodns/db.bugs.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -266,6 +306,14 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.OC";
@@ -282,17 +330,17 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/db.ftp.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
+    file "/etc/bind/geodns/db.bugs.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -318,6 +366,14 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org.SA";
@@ -334,6 +390,14 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "bugs.debian.org" {
     type master;
     file "/etc/bind/geodns/db.bugs.debian.org.SA";
@@ -342,7 +406,7 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "www.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org.SA";
     notify no;
@@ -350,9 +414,61 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.geo.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "ftp.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.ftp.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
+    file "/etc/bind/geodns/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -360,7 +476,7 @@ view "SA" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/db.packages.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -370,6 +486,14 @@ view "SA" {
 view "default" {
   match-clients { any; };
 
+  zone "volatile.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.volatile.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "security.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.security.debian.org";
@@ -386,17 +510,17 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "bugs.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org";
+    file "/etc/bind/geodns/db.ftp.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
+    file "/etc/bind/geodns/db.bugs.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };