no more lenny

[dsa-puppet.git] / modules / nagios / templates / inc-debian.org.erb

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index bbbe456cdaddc49d893529107f2b55cc8051ed6b..3c5819f789fbece5212ee71358e1b7b4889ee558 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,17 +4,15 @@
 ##
 
 <%=
-ournag = []
-localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster']
-    ournag << keyinfo[node][0]['ipHostNumber']
+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
 
-nagii = ournag
-
 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
 
@@ -28,3 +26,4 @@ out
 # 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