From: Stephen Gran <steve@lobefin.net>
Date: Sat, 23 May 2009 14:17:07 +0000 (+0100)
Subject: samhain ignore the new files for the surbl stuff
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=38bca420ba29405e30dfd9021e20a5fc3695e8c4;p=dsa-puppet.git

samhain ignore the new files for the surbl stuff
Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 27fc720e..d485c947 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -229,6 +229,17 @@ file=/etc/exim4/ssl/ca.crt
 file=/etc/exim4/ssl/ca.crl
 file=/etc/exim4/ssl/thishost.crt
 file=/etc/exim4/ssl/thishost.key
+<%=
+out=""
+if not nodeinfo['exim_heavy'].empty?
+  out = '
+file=/etc/exim4/surbl_whitelist.txt
+file=/etc/exim4/exim_surbl.pl
+file=/etc/exim4/ccTLD.txt
+'
+end
+out
+%>
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list