X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=63512d5a418070893de0c8c705832be8306217da;hb=6fca7a50094f0b830cb900eaa55dc749c9eef4e6;hp=13f6836e73e74427937b47eae41d1dd2a73bc168;hpb=96f38cb57f542dd3d83e9b0b7bf201e3ec23f2d3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 13f6836e7..63512d5a4 100644
--- 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 "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -24,23 +24,23 @@ view "AF" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -48,7 +48,39 @@ view "AF" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AF";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -58,17 +90,17 @@ view "AF" {
 view "AN" {
   match-clients { AN; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -76,23 +108,23 @@ view "AN" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -100,7 +132,39 @@ view "AN" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AN";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -110,17 +174,17 @@ view "AN" {
 view "AS" {
   match-clients { AS; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -128,23 +192,23 @@ view "AS" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -152,7 +216,39 @@ view "AS" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.AS";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -162,17 +258,17 @@ view "AS" {
 view "EU" {
   match-clients { EU; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -180,23 +276,23 @@ view "EU" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -204,7 +300,39 @@ view "EU" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.EU";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -214,17 +342,17 @@ view "EU" {
 view "NA" {
   match-clients { NA; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -232,23 +360,23 @@ view "NA" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -256,7 +384,39 @@ view "NA" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.NA";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -266,17 +426,17 @@ view "NA" {
 view "OC" {
   match-clients { OC; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -284,23 +444,23 @@ view "OC" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -308,7 +468,39 @@ view "OC" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.OC";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -318,17 +510,17 @@ view "OC" {
 view "SA" {
   match-clients { SA; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.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 "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -336,15 +528,55 @@ view "SA" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    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";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "packages.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.volatile.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -352,7 +584,51 @@ view "SA" {
 
   zone "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+};
+view "undef" {
+  match-clients { undef; };
+
+  zone "archive.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    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";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -360,7 +636,39 @@ view "SA" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org.undef";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -370,17 +678,17 @@ view "SA" {
 view "default" {
   match-clients { any; };
 
-  zone "security.geo.debian.org" {
+  zone "archive.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.archive.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "security.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.backports.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -388,23 +696,23 @@ view "default" {
 
   zone "bugs.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.bugs.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.bugs.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.geo.debian.org" {
+  zone "ftp-upcoming.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
   };
 
-  zone "www.debian.org" {
+  zone "ftp.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.www.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.ftp.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -412,7 +720,39 @@ view "default" {
 
   zone "packages.debian.org" {
     type master;
-    file "/etc/bind/geodns/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "security.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
+  zone "snapshot.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.snapshot.debian.org";
+    notify no;
+    allow-query { any; };
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };