X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=3c5819f789fbece5212ee71358e1b7b4889ee558;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=79d6db615ce005178b78217fddbf7390f2eaa244;hpb=fa77bc00c22ce6e516930e32030266476b5f5151;p=dsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 79d6db61..3c5819f7 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,10 +4,15 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+nagii = []
+scope.lookupvar('site::localinfo').keys.sort.each do |node|
+  if scope.lookupvar('site::localinfo')[node]['nagiosmaster'] or scope.lookupvar('site::localinfo')[node]['extranrpeclient']
+    nagii << scope.lookupvar('site::allnodeinfo')[node]['ipHostNumber']
+  end
+end
 
 case fqdn when
-  'mundy.debian.org', 'penalosa.debian.org', 'caballero.debian.org', 'peri.debian.org' then
+  'mundy.debian.org', 'caballero.debian.org' then
     nagii << '192.34.35.49'
 end
 
@@ -16,4 +21,9 @@ 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
+command[restart-ekey]=sudo /etc/init.d/ekeyd-egd-linux restart