X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=8d6979862f9914c3747e9d3310baa71480802f3f;hb=64f3c03733c86c1a5fb6327767b313058cf3d04c;hp=9baa77e0ae966653536754b196e3c12b0377241f;hpb=2973394f1d5992136dd2388e963690be88ac9346;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 9baa77e0a..8d6979862 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -109,17 +109,16 @@ 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
 file=/etc/nagios/nrpe.d
-<% extradir=""
+<%= extradir=""
 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"
+when "handel.debian.org": extradir="dir=8/etc/puppet"
+else extradir="file=/etc/puppet"
 end
 extradir
 %>
@@ -272,7 +271,7 @@ file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
 file=/etc/resolv.conf.dhclient-new
-<% extrafiles=""
+<%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
@@ -280,9 +279,8 @@ 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:
 end
-extradir
+extrafiles
 %>
 
 [IgnoreNone]
@@ -728,7 +726,8 @@ SetMailNum = 10
 SetMailAddress=samhain-reports@debian.org
 
 ## Mail relay (IP address)
-<%out=""
+<%=
+out=""
 if not nodeinfo['smarthost'].empty?
   out = '
 SetMailRelay = localhost