X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fnagios%2Ftemplates%2Finc-debian.org.erb;h=13d10eaf9ca91569f71937bcdc890525dcdf1bee;hb=26c8fca86c02f62535160d7890231162531beaa6;hp=3391745f9b69ed31d9c839e3d245f1dd78ea3d60;hpb=148a0de2e1fcbcf859821d55d251df6342243059;p=dsa-puppet.git

diff --git a/modules/nagios/templates/inc-debian.org.erb b/modules/nagios/templates/inc-debian.org.erb
index 3391745f..13d10eaf 100644
--- a/modules/nagios/templates/inc-debian.org.erb
+++ b/modules/nagios/templates/inc-debian.org.erb
@@ -4,14 +4,21 @@
 ##
 
 <%=
-nagii = [ '192.25.206.33', '82.195.75.106' ]
+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
 
 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
 %>
 
@@ -21,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