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

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 2f73886cc..f62c28234 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";
@@ -70,6 +62,14 @@ view "AF" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -90,14 +90,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";
@@ -146,6 +138,14 @@ view "AN" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -166,14 +166,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";
@@ -222,6 +214,14 @@ view "AS" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -242,14 +242,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";
@@ -298,6 +290,14 @@ view "EU" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -318,14 +318,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";
@@ -374,6 +366,14 @@ view "NA" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -394,14 +394,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,6 +442,14 @@ view "OC" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -470,14 +470,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";
@@ -526,6 +518,14 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -546,14 +546,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";
@@ -602,6 +594,14 @@ view "undef" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";
@@ -622,14 +622,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";
@@ -678,6 +670,14 @@ view "default" {
     allow-transfer { };
   };
 
+  zone "static.debian.org" {
+    type master;
+    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";