X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fgeodns%2Ffiles%2Fcommon%2Fnamed.conf.geo;h=026fe5f772afaf9838f51f394882fc81acc4a2ea;hb=4cc8421494eb1fe8ba6f4f41aa10490061a6dac1;hp=47005a0c112de87a72860450af947df7841c2a48;hpb=22262dcc08a33a6e15ae6976bb489c0fcea70b70;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 47005a0c1..026fe5f77 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -1,134 +1,69 @@
-//
-// 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
-//
+// This file was created by dsa-geodomains/zonebuilder --create-named-conf
+// and is distributed to hosts using puppet as
+// dsa-puppet/modules/geodns/files/common/named.conf.geo
+// you probably do not want to edit it manually wherever you find it
 
-view "Africa" {
-	match-clients {
-		Africa;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AF";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AF";
-		notify no;
-        };
+view "AF" {
+  match-clients { AF; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.AF"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-
-view "Asia" {
-	match-clients {
-		Asia;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AS";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AS";
-		notify no;
-        };
+view "AN" {
+  match-clients { AN; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.AN"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-
-view "Europe" {
-	match-clients { 
-		Europe; 
-	};
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.EU";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.EU";
-		notify no;
-        };
+view "AS" {
+  match-clients { AS; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.AS"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-
-view "NorthAmerica" {
-	match-clients {
-		NorthAmerica;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.NA";
-		notify no;
-        };
+view "EU" {
+  match-clients { EU; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.EU"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-view "SouthAmerica" {
-	match-clients {
-		SouthAmerica;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.SA";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.SA";
-		notify no;
-        };
+view "NA" {
+  match-clients { NA; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.NA"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-view "Oceania" {
-	match-clients {
-		Oceania;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.OC";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.OC";
-		notify no;
-        };
+view "OC" {
+  match-clients { OC; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.OC"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-view "Antarctica" {
-	match-clients {
-		Antarctica;
-        };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AN";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org.AN";
-		notify no;
-        };
+view "SA" {
+  match-clients { SA; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org.SA"; notify no; allow-query { any; }; allow-transfer { }; };
 };
-view "other" {
-        match-clients { any; };
-        recursion no;
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org";
-		notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                file "/etc/bind/db.security.debian.org";
-		notify no;
-        };
+view "default" {
+  match-clients { any; };
+  zone "security.geo.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "security.debian.org" { type master; file "/etc/bind/geodns/db.security.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.geo.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "www.debian.org" { type master; file "/etc/bind/geodns/db.www.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
+  zone "packages.debian.org" { type master; file "/etc/bind/geodns/db.packages.debian.org"; notify no; allow-query { any; }; allow-transfer { }; };
 };