From 91bbb2870ac80540f5e656a5a8fc57058d6f8e25 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 16 May 2009 10:21:41 +0100 Subject: [PATCH] Actually get the output of the block Signed-off-by: Stephen Gran --- modules/samhain/templates/samhainrc.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb index 9baa77e0a..cecf9df19 100644 --- a/modules/samhain/templates/samhainrc.erb +++ b/modules/samhain/templates/samhainrc.erb @@ -114,7 +114,7 @@ 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" @@ -272,7 +272,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 @@ -728,7 +728,8 @@ SetMailNum = 10 SetMailAddress=samhain-reports@debian.org ## Mail relay (IP address) -<%out="" +<%= +out="" if not nodeinfo['smarthost'].empty? out = ' SetMailRelay = localhost -- 2.20.1