From: Stephen Gran <steve@lobefin.net>
Date: Sat, 26 Sep 2009 08:16:46 +0000 (+0100)
Subject: Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=68e46d5ff9878db056e20dbabc588f966dc27b77;hp=b5249bd3292990afe0418a45410101dead763153;p=mirror%2Fdsa-puppet.git

Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
---

diff --git a/modules/exim/templates/virtualdomains.erb b/modules/exim/templates/virtualdomains.erb
index ab7811483..87948d402 100644
--- a/modules/exim/templates/virtualdomains.erb
+++ b/modules/exim/templates/virtualdomains.erb
@@ -49,6 +49,8 @@ nm.debian.org: user=nm group=nm directory=/org/nm.debian.org/mail/"
         #when "raff.debian.org" then "buildd.debian.org: user=wbadm group=wbadm directory=/srv/buildd.debian.org/mail
 #logs.buildd.debian.org: user=wbadm group=wbadm directory=/srv/logs.buildd.debian.org/mail"
 
+        when "ravel.debian.org" then "women.debian.org: user=nobody group=mujeres directory=/org/women.debian.org/mail"
+
         when "ries.debian.org" then "release.debian.org: user=release group=debian-release directory=/org/release.debian.org/mail
 ftp-master.debian.org: user=dak group=debadmin directory=/srv/ftp.debian.org/mail group_writable=true"
 
diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 9f28c536d..13f6836e7 100644
--- a/modules/geodns/files/common/named.conf.geo
+++ b/modules/geodns/files/common/named.conf.geo
@@ -22,6 +22,14 @@ view "AF" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -66,6 +74,14 @@ view "AN" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -110,6 +126,14 @@ view "AS" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -154,6 +178,14 @@ view "EU" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -198,6 +230,14 @@ view "NA" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -242,6 +282,14 @@ view "OC" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -286,6 +334,14 @@ view "SA" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.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";
@@ -330,6 +386,14 @@ view "default" {
     allow-transfer { };
   };
 
+  zone "bugs.debian.org" {
+    type master;
+    file "/etc/bind/geodns/db.bugs.debian.org";
+    notify no;
+    allow-query { any; };
+    allow-transfer { };
+  };
+
   zone "www.geo.debian.org" {
     type master;
     file "/etc/bind/geodns/db.www.debian.org";
diff --git a/modules/geodns/files/common/recvconf b/modules/geodns/files/common/recvconf
index 05419c909..dd9b57581 100755
--- a/modules/geodns/files/common/recvconf
+++ b/modules/geodns/files/common/recvconf
@@ -172,6 +172,7 @@ if [ -s "$tempscript" ]; then
 	    exit 1
 	fi
     done < "$tempscript"
+    rm -f -- "$tempoutput"
 fi
 
 # Check for any leftover files here; if there are any, exit with an error and print the list
@@ -181,7 +182,6 @@ if [ ! -z "$(find . -type f)" ]; then
 fi
 
 rm -f -- "$temptar"
-rm -f -- "$tempoutput"
 rm -f -- "$tempscript"
 cd
 rm -rf -- "$tempdir"
diff --git a/modules/geodns/files/common/recvconf.files b/modules/geodns/files/common/recvconf.files
index a14f73dfa..9c6667b6c 100644
--- a/modules/geodns/files/common/recvconf.files
+++ b/modules/geodns/files/common/recvconf.files
@@ -3,6 +3,54 @@
 # dsa-puppet/modules/geodns/files/common/recvconf.files
 # you probably do not want to edit it manually wherever you find it
 
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.AN
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.SA
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.OC
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.AS
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.AF
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.EU
+    postcommand sudo /etc/init.d/bind9 reload
+file etc/bind/geodns/db.bugs.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 bugs.debian.org etc/bind/geodns/db.bugs.debian.org.NA
+    postcommand sudo /etc/init.d/bind9 reload
 file etc/bind/geodns/db.packages.debian.org.AN
     perms 0644
     user geodnssync