new nagios gets same samhainrc as old

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 64ebe22..7c528f7 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -132,7 +132,7 @@ file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
 <%= extradir=""
 case fqdn 
-when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
+when "spohr.debian.org", "tchaikovsky.debian.org": extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
 else extradir="file=/etc/puppet"
 end
@@ -359,12 +359,13 @@ file=/etc/cron.d/dsa-puppet-stuff
 file=/etc/cron.d/dsa-buildd
 <%= extrafiles=""
 case fqdn 
-when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
+when "spohr.debian.org", "tchaikovsky.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 file=/etc/nagios3/puppetconf.d/auto-services.cfg
 file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
-file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
+file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
+file=/etc/munin/munin.conf"
 when "handel.debian.org": extrafiles="dir=8/etc/puppet"
 when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
 when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
@@ -374,6 +375,10 @@ end
 extrafiles
 %>
 
+<% if nodeinfo['buildd'] -%>
+dir=3/etc/lvm
+<% end -%>
+
 [IgnoreNone]
 ##
 ## for these files, all modifications (even access time) are reported