X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=5732e2a310dadaa196b09b5d7261cbb4152ad719;hb=33f6ed464be61068fab74b37465c6ac5c8349157;hp=0f8952ab8c3cf2e5f63f39ef6d71a732b3e79721;hpb=251eaef2ab7b45a4089b5a6211040f7be30c7f1e;p=mirror%2Fdsa-puppet.git diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb index 0f8952ab8..5732e2a31 100644 --- a/modules/nagios/templates/inc-debian.org.erb +++ b/modules/nagios/templates/inc-debian.org.erb @@ -6,8 +6,8 @@ <%= nagii = [] localinfo.keys.sort.each do |node| - if localinfo[node]['nagiosmaster'] - nagii << keyinfo[node][0]['ipHostNumber'] + if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient'] + nagii << 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