From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 25 Sep 2009 09:04:07 +0000 (+0200)
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=8b258c10935f31d9c281be0e31fcd6894ed1251f;hp=b09778215c0522d2e00ae76c34b8c15040014d2c;p=mirror%2Fdsa-puppet.git

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

* 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet:
  Add women.d.o mail on ravel
  we'll just take valid mail at data time from other d.o hosts
  cert if good enough for data time checks as well for mailrelay
  either make dijkstra relay, or break spohr
  ok, you're starting to make cranky
  put the constraint in the right fact, Steve
  a random test
---

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.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