From: Stephen Gran <steve@lobefin.net>
Date: Sat, 16 May 2009 09:48:36 +0000 (+0100)
Subject: Put the puppet block in [IgnoreAll] on handel
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9b8ef5d751cf247c5047d951b46fb1b409f8ae9b;p=mirror%2Fdsa-puppet.git

Put the puppet block in [IgnoreAll] on handel
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 8d6979862..6d3e1a444 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -117,7 +117,6 @@ file=/etc/nagios/nrpe.d
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
-when "handel.debian.org": extradir="dir=8/etc/puppet"
 else extradir="file=/etc/puppet"
 end
 extradir
@@ -279,6 +278,7 @@ 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"
+when "handel.debian.org": extradir="dir=8/etc/puppet"
 end
 extrafiles
 %>