X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=7c528f7ba146477b7aa57a8cae9add2b73c2eece;hb=250be9b767d25539ab14610fbc4324e625ebe0be;hp=b286e3d85c4447101b3a02abf4321ff00138bd0f;hpb=3c27f9ab565b57acd39172ebf2d13a000935522c;p=mirror%2Fdsa-puppet.git diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index b286e3d85..7c528f7ba 100644 --- 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,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