first stab at making puppet figure out info for nagios and munin master

[dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e4afdac48f5f97ed7c0254ee50dea9f805823a42..0ed6a86571b4684bbe37f68c110cb51bc24216b3 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -134,13 +134,13 @@ file=/etc/nagios/nrpe.d
 file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
 <%= extradir=""
-case fqdn 
-when "tchaikovsky.debian.org": extradir="file=/etc/nagios3/puppetconf.d
+if nodeinfo['nagiosmaster']
+  extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
-else extradir="file=/etc/puppet"
 end
 extradir
 %>
+file=/etc/puppet
 file=/etc/cron.d
 file=/usr/lib/nagios/plugins
 file=/usr/sbin