<%=
nagii = []
-localinfo.keys.sort.each do |node|
- if localinfo[node]['nagiosmaster'] or localinfo[node]['extranrpeclient']
- nagii << allnodeinfo[node]['ipHostNumber']
- end
+roles = scope.lookupvar('site::roles')
+roles['nagiosmaster'].each do |nag|
+ nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+end
+roles['extranrpeclient'].each do |nag|
+ nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
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
-out = "allowed_hosts=" + nagii.join(',')
+out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
out
%>
# 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
+command[dsa2_shutdown]=if /usr/lib/nagios/plugins/check_procs -w 1: -u root -C shutdown > /dev/null || /usr/lib/nagios/plugins/check_procs -w 1: -u root -a /lib/systemd/systemd-shutdownd > /dev/null; then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi
+command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart
+command[restart-samhain]=sudo /usr/sbin/service samhain restart
+command[restart-ekey]=sudo /usr/sbin/service ekeyd-egd-linux restart