X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=9cf43ca692309e1c5a62dc1b5bca71d971386a34;hb=2f0cdbb3c69400e04c769e9efaa34fa8940267a2;hp=8c65496d27031f175936a93ed03dd079a26e5334;hpb=edcf7c0b4b37c0224e1e9604725cbfdf69da9253;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 8c65496d2..9cf43ca69 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -1,151 +1,248 @@
-//
-// THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-// USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-//
-
-view "Nagios" {
-	match-clients {
-		Nagios;
+view "AF" {
+        match-clients {
+                AF;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AF";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AF";
+                notify no;
         };
-        recursion yes;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AF";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AF";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.AF";
+                notify no;
         };
 };
 
-view "Africa" {
-	match-clients {
-		Africa;
+view "AN" {
+        match-clients {
+                AN;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AN";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AN";
+                notify no;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AF";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AN";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AF";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AN";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.AN";
+                notify no;
         };
 };
 
-view "Asia" {
-	match-clients {
-		Asia;
+view "AS" {
+        match-clients {
+                AS;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AS";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.AS";
+                notify no;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AS";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AS";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AS";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.AS";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.AS";
+                notify no;
         };
 };
 
-view "Europe" {
-	match-clients { 
-		Europe; 
-	};
-        recursion no;
+view "EU" {
+        match-clients {
+                EU;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.EU";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.EU";
+                notify no;
+        };
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.EU";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.EU";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.EU";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.EU";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.EU";
+                notify no;
         };
 };
 
-view "NorthAmerica" {
-	match-clients {
-		NorthAmerica;
+view "NA" {
+        match-clients {
+                NA;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.NA";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.NA";
+                notify no;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.NA";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.NA";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.NA";
+                notify no;
         };
 };
-view "SouthAmerica" {
-	match-clients {
-		SouthAmerica;
+
+view "OC" {
+        match-clients {
+                OC;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.OC";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.OC";
+                notify no;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.SA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.OC";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.SA";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.OC";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.OC";
+                notify no;
         };
 };
-view "Oceania" {
-	match-clients {
-		Oceania;
+
+view "SA" {
+        match-clients {
+                SA;
+        };
+        zone "www.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.SA";
+                notify no;
+        };
+        zone "www.geo.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.www.debian.org.SA";
+                notify no;
         };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.OC";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.SA";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.OC";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org.SA";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org.SA";
+                notify no;
         };
 };
-view "Antarctica" {
-	match-clients {
-		Antarctica;
+
+view "default" {
+        match-clients {
+                any;
         };
-        recursion no;
-        zone "security.debian.org" {
+        zone "www.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AN";
-		notify no;
+                file "/etc/bind/geodns/db.www.debian.org";
+                notify no;
         };
-        zone "security.geo.debian.org" {
+        zone "www.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org.AN";
-		notify no;
+                file "/etc/bind/geodns/db.www.debian.org";
+                notify no;
         };
-};
-view "other" {
-        match-clients { any; };
-        recursion no;
         zone "security.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org";
+                notify no;
         };
         zone "security.geo.debian.org" {
                 type master;
-                file "/etc/bind/db.security.debian.org";
-		notify no;
+                file "/etc/bind/geodns/db.security.debian.org";
+                notify no;
+        };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.video.debconf.debian.org";
+                notify no;
         };
 };
+