]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
new nagios gets same samhainrc as old
authorStephen Gran <steve@lobefin.net>
Sun, 7 Feb 2010 05:53:42 +0000 (05:53 +0000)
committerStephen Gran <steve@lobefin.net>
Sun, 7 Feb 2010 05:53:42 +0000 (05:53 +0000)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/samhain/templates/samhainrc.erb

index b286e3d85c4447101b3a02abf4321ff00138bd0f..7c528f7ba146477b7aa57a8cae9add2b73c2eece 100644 (file)
@@ -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,7 +359,7 @@ 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