Use autogenerated recvconf and named config

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 733e06b..1411ce5 100644 (file)
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -1,208 +1,61 @@
+// 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-
 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;
-        };
+  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 { }; };
 };
-

diff --git a/modules/geodns/files/common/recvconf.files b/modules/geodns/files/common/recvconf.files
index 6192638..3801e55 100644 (file)
--- a/modules/geodns/files/common/recvconf.files
+++ b/modules/geodns/files/common/recvconf.files
@@ -1,29 +1,25 @@
-#
-# 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-recvconf-conf
+# and is distributed to hosts using puppet as
+# dsa-puppet/modules/geodns/files/common/recvconf.files
+# you probably do not want to edit it manually wherever you find it
 
-###
-# security.debian.org
-###
-
-file etc/bind/geodns/db.security.debian.org
+file etc/bind/geodns/db.security.debian.org.AN
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.AN
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.AF
+file etc/bind/geodns/db.security.debian.org.SA
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.AF
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.SA
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.AN
+file etc/bind/geodns/db.security.debian.org.OC
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.AN
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.OC
     postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.security.debian.org.AS
     perms 0644
@@ -31,52 +27,47 @@ file etc/bind/geodns/db.security.debian.org.AS
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.AS
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.EU
+file etc/bind/geodns/db.security.debian.org.AF
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.EU
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.AF
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.NA
+file etc/bind/geodns/db.security.debian.org
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.NA
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.OC
+file etc/bind/geodns/db.security.debian.org.EU
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.OC
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.EU
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.security.debian.org.SA
+file etc/bind/geodns/db.security.debian.org.NA
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.SA
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail security.debian.org etc/bind/geodns/db.security.debian.org.NA
     postcommand sudo /etc/init.d/bind9 reload
-
-###
-# www.debian.org
-###
-
-file etc/bind/geodns/db.www.debian.org
+file etc/bind/geodns/db.www.debian.org.AN
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AN
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.AF
+file etc/bind/geodns/db.www.debian.org.SA
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AF
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.SA
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.AN
+file etc/bind/geodns/db.www.debian.org.OC
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AN
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.OC
     postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.www.debian.org.AS
     perms 0644
@@ -84,27 +75,27 @@ file etc/bind/geodns/db.www.debian.org.AS
     group geodnssync
     precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AS
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.EU
+file etc/bind/geodns/db.www.debian.org.AF
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.EU
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.AF
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.NA
+file etc/bind/geodns/db.www.debian.org
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.NA
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.OC
+file etc/bind/geodns/db.www.debian.org.EU
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.OC
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.EU
     postcommand sudo /etc/init.d/bind9 reload
-file etc/bind/geodns/db.www.debian.org.SA
+file etc/bind/geodns/db.www.debian.org.NA
     perms 0644
     user geodnssync
     group geodnssync
-    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.SA
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail www.debian.org etc/bind/geodns/db.www.debian.org.NA
     postcommand sudo /etc/init.d/bind9 reload