Try to avoid reserved site keyword

[mirror/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 817366e..8a0babb 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -5,12 +5,12 @@
 
 <%=
 nagii = []
-roles = scope.lookupvar('site::roles')
+roles = scope.lookupvar('deprecated::roles')
 roles['nagiosmaster'].each do |nag|
-       nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+       nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
 roles['extranrpeclient'].each do |nag|
-       nagii << scope.lookupvar('site::allnodeinfo')[nag]['ipHostNumber']
+       nagii << scope.lookupvar('deprecated::allnodeinfo')[nag]['ipHostNumber']
 end
 
 out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
@@ -22,7 +22,7 @@ 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 || /usr/lib/nagios/plugins/check_procs -w 1: -u root -a /lib/systemd/systemd-shutdownd > /dev/null || ( busctl get-property org.freedesktop.login1 /org/freedesktop/login1 org.freedesktop.login1.Manager ScheduledShutdown 2> /dev/null | awk '$3 > 0 { t=$3; } END { exit (t == 0)}' ); then echo 'system-in-shutdown'; else echo 'no shutdown running' ; fi
+command[dsa2_shutdown]=if /usr/local/bin/dsa-is-shutdown-scheduled; 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