Ignore ganeti-os-noop on csail-nodeX

[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 70f37b0bc00e0b32cf68262f9968a2b54fe52957..13d10eaf9ca91569f71937bcdc890525dcdf1bee 100644 (file)
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,21 +4,21 @@
 ##
 
 <%=
-ournag = []
-localinfo.keys.sort.each do |node|
-  if localinfo[node]['nagiosmaster'] == "true"
-    ournag << keyinfo[node][0]['ipHostNumber']
-  end
+nagii = []
+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
-
-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
 
-out = "allowed_hosts=" + nagii.join(',')
+out = "allowed_hosts=" + nagii.flatten.sort.uniq.join(',')
 out
 %>
 
@@ -28,3 +28,6 @@ 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 /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