From 7279b0d0194e8eb0373dda44fa29f0ef3390f3bf Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 17 Jun 2011 19:10:33 +0200
Subject: [PATCH] named.conf.geo: sort config entries and add backports

---
 modules/named/files/common/named.conf.geo | 288 ++++++++++++++--------
 1 file changed, 180 insertions(+), 108 deletions(-)

diff --git a/modules/named/files/common/named.conf.geo b/modules/named/files/common/named.conf.geo
index d99b0165..a5b2c61c 100644
--- a/modules/named/files/common/named.conf.geo
+++ b/modules/named/files/common/named.conf.geo
@@ -14,17 +14,17 @@ view "AF" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -38,33 +38,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AF";
+    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 { };
@@ -82,17 +90,17 @@ view "AN" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -106,33 +114,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AN";
+    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 { };
@@ -150,17 +166,17 @@ view "AS" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -174,33 +190,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.AS";
+    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 { };
@@ -218,17 +242,17 @@ view "EU" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -242,33 +266,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.EU";
+    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 { };
@@ -286,17 +318,17 @@ view "NA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -310,33 +342,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.NA";
+    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 { };
@@ -354,17 +394,17 @@ view "OC" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -378,33 +418,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.OC";
+    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 { };
@@ -422,17 +470,17 @@ view "SA" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -446,33 +494,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.SA";
+    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";
     notify no;
     allow-query { any; };
     allow-transfer { };
@@ -490,17 +546,17 @@ view "undef" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -514,33 +570,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org.undef";
+    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 { };
@@ -558,17 +622,17 @@ view "default" {
     allow-transfer { };
   };
 
-  zone "volatile.debian.org" {
+  zone "backports.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.volatile.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 { };
@@ -582,33 +646,41 @@ 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 "volatile.debian.org" {
     type master;
-    file "/etc/bind/geodns/zonefiles/db.packages.debian.org";
+    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 { };
-- 
2.39.2