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

diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp
index 706d40e13d30de18caff49513e5aa41781d53a4d..5283098605843db40c1155dbb43ab231ebceb8c1 100644 (file)
--- a/modules/apache2/manifests/init.pp
+++ b/modules/apache2/manifests/init.pp
@@ -33,9 +33,10 @@ class apache2 {
                "/srv/www/default.debian.org/htdocs/index.html":
                        content => template("apache2/default-index.html");
 
-               "/var/log/apache2":
-                       mode    => 755,
-                       ensure  => directory;
+               # sometimes this is a symlink
+               #"/var/log/apache2":
+               #       mode    => 755,
+               #       ensure  => directory;
        }
 
        exec { "apache2 reload":

diff --git a/modules/geodns/files/common/named.conf.geo b/modules/geodns/files/common/named.conf.geo
index 733e06b8cef518a2dda1f3572bed361b43d1641f..9cf43ca692309e1c5a62dc1b5bca71d971386a34 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.video.debconf.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.video.debconf.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.video.debconf.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.video.debconf.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.video.debconf.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.video.debconf.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.video.debconf.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.video.debconf.debian.org";
+                notify no;
+        };
 };
 

diff --git a/modules/geodns/files/common/recvconf.files b/modules/geodns/files/common/recvconf.files
index 18db5ff790e9ccbb82a0ea2f393ee9354e0abb2d..2acbfeb5cd66918b7fe87b4ce03d1f15a5ca8ca1 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

diff --git a/modules/nagios/files/per-host/dijkstra/obsolete-packages-ignore.d-hostspecific b/modules/nagios/files/per-host/dijkstra/obsolete-packages-ignore.d-hostspecific
new file mode 100644 (file)
index 0000000..4586eb0
--- /dev/null
+++ b/modules/nagios/files/per-host/dijkstra/obsolete-packages-ignore.d-hostspecific
@@ -0,0 +1,6 @@
+##
+## 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
+##
+
+kvm

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 595cfd500633f46bd4da07eede93797921934354..21b657179eb54b6fcf03411ae72bed82e6607e4b 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -21,6 +21,7 @@ Defaults      env_reset
 
 # Host alias specification
 Host_Alias     QAHOSTS         = master, merkel
+Host_Alias     WEBHOSTS        = klecker, wolkenstein
 # User alias specification
 User_Alias     QACORE          = aba, djpig, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
 
@@ -110,7 +111,7 @@ dak         ries=(archvsync)        NOPASSWD:/home/archvsync/runmirrors
 %sec_data      klecker=(archvsync)     NOPASSWD: /home/archvsync/security/signal ""
 dak            klecker=(archvsync)     NOPASSWD: /home/archvsync/signal_security
 # web stuff
-debwww         klecker=(archvsync)     NOPASSWD: /home/archvsync/webmirrors/runmirrors
+debwww         WEBHOSTS=(archvsync)    NOPASSWD: /home/archvsync/webmirrors/runmirrors
 # more list stuff
 %list          liszt=(root)            /usr/sbin/postfix reload
 %list          liszt=(root)            /usr/sbin/qshape, /usr/sbin/postsuper