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:
  raff doesn't have enough disk to do the usual daemon log for bind
  and on the way in
  penalosa is a buildd and gets mail relay

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 88b4dcbc8c9de7b4d858008fe227783f61ad202d..79d6db615ce005178b78217fddbf7390f2eaa244 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -14,3 +14,6 @@ end
 out = "allowed_hosts=" + nagii.join(',')
 out
 %>
+
+
+command[dsa2_shutdown]=if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi