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

diff --git a/facts/raidarray.rb b/facts/raidarray.rb
index 592f006..997bf14 100644 (file)
--- a/facts/raidarray.rb
+++ b/facts/raidarray.rb
@@ -27,7 +27,7 @@ end
 
 Facter.add("mptraid") do
        setcode do
-               FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt9") or FileTest.exist?("/proc/mpt/summary")
+               FileTest.exist?("/dev/mptctl") or FileTest.exist?("/dev/mpt0") or FileTest.exist?("/proc/mpt/summary")
        end
 end
 

diff --git a/manifests/site.pp b/manifests/site.pp
index 7cfd069..513d1ff 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,7 +43,7 @@ node default {
         "true":    { package { acpid: ensure => installed } }
     }
     case $mptraid {
-        "true":    { package { mpt-status: ensure => installed } }
+        "true":    { include "raidmpt" }
     }
 
     case $mta {

diff --git a/modules/kfreebsd/files/dsa-killruby b/modules/kfreebsd/files/dsa-killruby
index cf5056a..46a39f0 100644 (file)
--- a/modules/kfreebsd/files/dsa-killruby
+++ b/modules/kfreebsd/files/dsa-killruby
@@ -1,5 +1,10 @@
+##
+## 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
+##
+
 # every hour, kill all puppet jobs that are lingering around, i.e. all
 # processes whose parent is init, and who have lived for longer than an hour
 # (if they lived for 10 hours then they get to live an hour longer because
 # the regex is just that gracious.
-12 * * * *     root    pgrep -P 1 -f '/usr/bin/ruby1.8 /usr/sbin/puppetd --factsync -o --no-daemonize' | xargs ps --no-headers -o pid,etime  | grep '[1-9]:..:..$' | awk '{print $1}' | xargs --no-run-if-empty kill -9
+12 * * * *     root    pgrep -P 1 -f '/usr/bin/ruby1.8 /usr/sbin/puppetd --factsync -o --no-daemonize' | xargs --no-run-if-empty ps --no-headers -o pid,etime | grep '[1-9]:..:..$' | awk '{print $1}' | xargs --no-run-if-empty kill -9

diff --git a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
index 89f7acd..656a24d 100644 (file)
--- a/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
+++ b/modules/nagios/templates/obsolete-packages-ignore.d-hostspecific.erb
@@ -14,6 +14,7 @@ when /stabile.debian.org/:            ignore << "xfsprogs"
 when /(zandonai|zelenka).debian.org/: ignore << %w{zabbix-agent rrdcollect}
 when /(dijkstra|unger|luchesi|schumann).debian.org/: ignore << "qemu-kvm"
 when "powell.debian.org":             ignore << %w{e2fslibs e2fsprogs libblkid1 libcomerr2 libss2 libuuid1 uuid-runtime}
+when "zee.debian.org":             ignore << %w{dpkg-dev dpkg}
 end
 
 ignore.flatten.join("\n")

diff --git a/modules/portforwarder/templates/authorized_keys.erb b/modules/portforwarder/templates/authorized_keys.erb
index c230bbc..ff38994 100644 (file)
--- a/modules/portforwarder/templates/authorized_keys.erb
+++ b/modules/portforwarder/templates/authorized_keys.erb
@@ -1,3 +1,8 @@
+##
+## 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
+##
+
 <%=
 def getportforwarderkey(host)
        key = nil

diff --git a/modules/portforwarder/templates/xinetd.erb b/modules/portforwarder/templates/xinetd.erb
index 897924d..2d8b994 100644 (file)
--- a/modules/portforwarder/templates/xinetd.erb
+++ b/modules/portforwarder/templates/xinetd.erb
@@ -1,3 +1,8 @@
+##
+## 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
+##
+
 <%=
 lines = []
 

diff --git a/modules/raidmpt/manifests/init.pp b/modules/raidmpt/manifests/init.pp
new file mode 100644 (file)
index 0000000..e04cd2f
--- /dev/null
+++ b/modules/raidmpt/manifests/init.pp
@@ -0,0 +1,21 @@
+class raidmpt {
+    package {
+        mpt-status: ensure => installed;
+    }
+
+    file {
+        "/etc/default/mpt-statusd":
+            content =>  "# This file is under puppet control\nRUN_DAEMON=no\n",
+            notify  => Exec["mpt-statusd-stop"],
+            ;
+    }
+    exec {
+        "mpt-statusd-stop":
+            command => 'pidfile=/var/run/mpt-statusd.pid; ! [ -e "$pidfile" ] || /sbin/start-stop-daemon --oknodo --stop --signal TERM --quiet --pidfile "$pidfile"; rm -f "$pidfile";  pkill -INT  -P 1 -u 0 -f "/usr/bin/daemon /etc/init.d/mpt-statusd check_mpt"',
+            refreshonly => true,
+            ;
+    }
+}
+# vim:set et:
+# vim:set ts=4:
+# vim:set shiftwidth=4:

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 1c1b306..79532aa 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -68,7 +68,7 @@
 # RedefUser0=(no default)
 # RedefUser1=(no default)
 <% if nodeinfo['buildd'] -%>
-IgnoreMissing=/etc/lvm/archive/vg.*.vg
+IgnoreMissing=/etc/lvm/archive/.*.vg
 <% end -%>
 
 [Attributes]

diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers
index 289320f..f8550f0 100644 (file)
--- a/modules/sudo/files/common/sudoers
+++ b/modules/sudo/files/common/sudoers
@@ -26,7 +26,7 @@ Host_Alias    WEBHOSTS        = klecker, wolkenstein
 Host_Alias     SECHOSTS        = klecker, chopin
 Host_Alias     ZIVITHOSTS      = zelenka, zandonai
 Host_Alias     AACRAIDHOSTS    = bellini, cimarosa, morricone, paganini, respighi, vivaldi, beethoven, pettersson
-Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara
+Host_Alias     MEGARAIDHOSTS   = grieg, rautavaara, sibelius
 Host_Alias     MPTRAIDHOSTS    = master, fasch, holter, barber, biber, cilea, vitry, krenek, scelsi, orff, field
 # User alias specification
 User_Alias     QACORE          = aba, djpig, geissert, hertzog, jeroen, joerg, lucas, luk, myon, tbm, weasel, zack
@@ -57,7 +57,7 @@ nagios                ALL=(ALL)       NOPASSWD: /usr/sbin/hpacucli controller slot=[02] show status
 # other raid controllers
 nagios         powell=(ALL)    NOPASSWD: /usr/local/sbin/areca-cli vsf info
 nagios         puccini=(ALL)   NOPASSWD: /usr/local/bin/tw_cli info c0 u0 status
-nagios         MPGRAIDHOSTS=(ALL)      NOPASSWD: /usr/sbin/mpt-status -s
+nagios         MPTRAIDHOSTS=(ALL)      NOPASSWD: /usr/sbin/mpt-status -s
 nagios         AACRAIDHOSTS=(ALL)      NOPASSWD: /usr/local/bin/arcconf GETCONFIG 1 LD, /usr/local/bin/arcconf GETCONFIG 1 AD
 nagios         MEGARAIDHOSTS=(ALL)     NOPASSWD: /usr/local/bin/megarc -AllAdpInfo -nolog, /usr/local/bin/megarc -dispCfg -a0 -nolog
 
@@ -110,8 +110,8 @@ pkg_user    powell=(archvsync)      NOPASSWD: /home/archvsync/bin/pushpdo
 # remote power to babylon5 in the same rack:
 joerg          unger=(ALL)             /usr/bin/sispmctl -t 1, /usr/bin/sispmctl -g 1
 # wbadm can update all buildd* users' keys on buildd.d.o
-%wbadm         cimarosa=(root)         /usr/local/bin/update-buildd-sshkeys
-wbadm          cimarosa=(postgres)     NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
+%wbadm         cimarosa,grieg=(root)           /usr/local/bin/update-buildd-sshkeys
+wbadm          cimarosa,grieg=(postgres)       NOPASSWD: /usr/bin/pg_dumpall --cluster 8.4/wanna-build
 # mirror push
 dak            ries=(archvsync)        NOPASSWD:/home/archvsync/runmirrors
 planet         senfl=(archvsync)       NOPASSWD: /home/archvsync/bin/runplanet ""