X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=6d3e1a444e3c68d094ed9dfb89ea33953cb553aa;hb=9b8ef5d751cf247c5047d951b46fb1b409f8ae9b;hp=cecf9df19dc9cf0d762ce691edc86931adedbeac;hpb=91bbb2870ac80540f5e656a5a8fc57058d6f8e25;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index cecf9df19..6d3e1a444 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -109,7 +109,6 @@ file=/etc/exim4/ssl
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
-file=/etc/puppet
 file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
@@ -118,8 +117,7 @@ file=/etc/nagios/nrpe.d
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
-when "handel.debian.org": extrafiles="dir=8/etc/puppet"
-default: extrafiles="file=/etc/puppet"
+else extradir="file=/etc/puppet"
 end
 extradir
 %>
@@ -280,9 +278,9 @@ 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"
-default:
+when "handel.debian.org": extradir="dir=8/etc/puppet"
 end
-extradir
+extrafiles
 %>
 
 [IgnoreNone]