X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=c53e7389f084e8d6091d9c8069422c5f4aef4f84;hb=31cc527d395038046cf965a79fc3b9ea9aed6160;hp=79d6db615ce005178b78217fddbf7390f2eaa244;hpb=e0d3f2157c8502ab5a11fa4249a2a8d087f3eccc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 79d6db615..c53e7389f 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,7 +4,7 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+nagii = [ '206.12.19.118', '192.25.206.33', '82.195.75.106' ]
 
 case fqdn when
   'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
@@ -16,4 +16,8 @@ out
 %>
 
 
+# the string "system-in-shutdown" is used by the remote side to tell
+# if a system is running shutdown.  We do not use check_nrpe's
+# exit code as that does not reliably tell us if the check could
+# not connect to the nrpe server or if the remote check returned not-null.
 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