From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2019 15:58:45 +0000 (+0200)
Subject: All these files that we ignore on heavy exim hosts have not changed in the last 4... 
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d53c789b368b6d3dbc41671fd7a1f16050172627;p=mirror%2Fdsa-puppet.git

All these files that we ignore on heavy exim hosts have not changed in the last 4+ years on the hosts I checked; stop ignoring them
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index baa7b5ad3..13282df11 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -320,19 +320,6 @@ file=/etc/rabbitmq/enabled_plugins
 dir=/etc/bacula/storages-list.d
 dir=/etc/bacula/storage-conf.d
 dir=/etc/bacula/conf.d
-<%=
-out=""
-if scope.lookupvar('deprecated::nodeinfo')['heavy_exim']
-  out = '
-file=/etc/exim4/surbl_whitelist.txt
-file=/etc/exim4/exim_surbl.pl
-file=/etc/exim4/ccTLD.txt
-file=/etc/clamav-unofficial-sigs.conf
-file=/etc/clamav-unofficial-sigs.dsa.conf
-'
-end
-out
-%>
 file=/etc/munin/plugins/bind
 file=/etc/munin/plugins/bind_views
 file=/etc/munin/plugins/cpu