X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=b06c3284d48a119304caf1bbef42ea3e86a4255f;hb=5a8df552f7733b7498c23be8e5a4f72cd9c4902b;hp=bf6c2f95dfc779229451542d61d01b26cb02a36c;hpb=483f9c11e2419da2aa3fe83f306a2adf5f6938ef;p=mirror%2Fdsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index bf6c2f95d..b06c3284d 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,9 +5,9 @@
 
 <%=
 nagii = []
-localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
-    nagii << keyinfo[node]['ipHostNumber']
+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
 
@@ -26,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