Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 733e06b..f42f35c 100644 (file)
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -22,6 +22,11 @@ view "AF" {
                 file "/etc/bind/geodns/db.security.debian.org.AF";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.AF";
+                notify no;
+        };
 };
 
 view "AN" {
@@ -48,6 +53,11 @@ view "AN" {
                 file "/etc/bind/geodns/db.security.debian.org.AN";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.AN";
+                notify no;
+        };
 };
 
 view "AS" {
@@ -74,6 +84,11 @@ view "AS" {
                 file "/etc/bind/geodns/db.security.debian.org.AS";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.AS";
+                notify no;
+        };
 };
 
 view "EU" {
@@ -100,6 +115,11 @@ view "EU" {
                 file "/etc/bind/geodns/db.security.debian.org.EU";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.EU";
+                notify no;
+        };
 };
 
 view "NA" {
@@ -126,6 +146,11 @@ view "NA" {
                 file "/etc/bind/geodns/db.security.debian.org.NA";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.NA";
+                notify no;
+        };
 };
 
 view "OC" {
@@ -152,6 +177,11 @@ view "OC" {
                 file "/etc/bind/geodns/db.security.debian.org.OC";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.OC";
+                notify no;
+        };
 };
 
 view "SA" {
@@ -178,6 +208,11 @@ view "SA" {
                 file "/etc/bind/geodns/db.security.debian.org.SA";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org.SA";
+                notify no;
+        };
 };
 
 view "default" {
@@ -204,5 +239,10 @@ view "default" {
                 file "/etc/bind/geodns/db.security.debian.org";
                 notify no;
         };
+        zone "video.debconf.debian.org" {
+                type master;
+                file "/etc/bind/geodns/db.security.debian.org";
+                notify no;
+        };
 };
 

diff --git a/modules/geodns/files/common/recvconf.files b/modules/geodns/files/common/recvconf.files
index 18db5ff..2acbfeb 100644 (file)
--- a/modules/geodns/files/common/recvconf.files
+++ b/modules/geodns/files/common/recvconf.files
@@ -3,6 +3,10 @@
 # USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 #
 
+###
+# security.debian.org
+###
+
 file etc/bind/geodns/named.conf.geo.security.debian.org
     perms 0644
     user geodnssync
@@ -56,6 +60,11 @@ file etc/bind/geodns/db.security.debian.org.SA
     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
     postcommand sudo /etc/init.d/bind9 reload
+
+###
+# www.debian.org
+###
+
 file etc/bind/geodns/named.conf.geo.www.debian.org
     perms 0644
     user geodnssync
@@ -109,3 +118,61 @@ file etc/bind/geodns/db.www.debian.org.SA
     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
     postcommand sudo /etc/init.d/bind9 reload
+
+###
+# video.debconf.debian.org
+###
+
+file etc/bind/geodns/named.conf.geo.video.debconf.debian.org
+    perms 0644
+    user geodnssync
+    group geodnssync
+    postcommand /usr/sbin/named-checkconf /etc/bind/named.conf && sudo /usr/sbin/rndc reconfig
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.AF
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.AN
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.debian.org.AS
+    perms 0644
+    user geodnssync
+    group geodnssync
+    precommand /usr/sbin/named-checkzone -q -k fail -n fail -S fail -i full -m fail -M fail video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.AS
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.EU
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.NA
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.OC
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.video.debconf.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 video.debconf.debian.org etc/bind/geodns/db.video.debconf.debian.org.SA
+    postcommand sudo /etc/init.d/bind9 reload