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=9cf43ca692309e1c5a62dc1b5bca71d971386a34;hpb=2f46ccf3bc1722755fbbb5696531deb3e4a5d50d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 9cf43ca69..026fe5f77 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -1,248 +1,69 @@
+// 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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.AF";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.AN";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.AS";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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/geodns/db.security.debian.org.EU";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.NA";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.OC";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "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;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org.SA";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 "default" {
-        match-clients {
-                any;
-        };
-        zone "www.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.www.debian.org";
-                notify no;
-        };
-        zone "www.geo.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.www.debian.org";
-                notify no;
-        };
-        zone "security.debian.org" {
-                type master;
-                file "/etc/bind/geodns/db.security.debian.org";
-                notify no;
-        };
-        zone "security.geo.debian.org" {
-                type master;
-                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;
-        };
+  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 { }; };
 };
-