X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnamed%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=2f73886cc69be7042fbcd5ed357854c570850f20;hb=957be8e44295ff31e57b4f0214ab1f4daaa9c7ff;hp=6a682fd9f158ca4fbca8309ca94fef33046c433a;hpb=d1468d96b580b3d6f0a6119817062c8f982ac395;p=mirror%2Fdsa-puppet.git

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index 6a682fd9f..2f73886cc 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -6,25 +6,33 @@
 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -38,33 +46,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AF";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -74,25 +82,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -106,33 +122,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AN";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -142,25 +158,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -174,33 +198,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.AS";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -210,25 +234,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -242,33 +274,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.EU";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -278,25 +310,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -310,33 +350,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.NA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -346,25 +386,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -378,33 +426,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.OC";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -414,25 +462,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -446,33 +502,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.SA";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -482,25 +538,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  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 { };
@@ -514,33 +578,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org.undef";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -550,25 +614,33 @@ 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.geo.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.security.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.backports.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 { };
+  };
+
+  zone "ftp-upcoming.debian.org" {
+    type master;
+    file "/etc/bind/geodns/zonefiles/db.ftp-upcoming.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -582,33 +654,33 @@ 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 "www.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    file "/etc/bind/geodns/zonefiles/db.www.debian.org";
     notify no;
     allow-query { any; };
     allow-transfer { };