From: Stephen Gran <steve@lobefin.net>
Date: Sat, 12 May 2012 07:22:21 +0000 (+0100)
Subject: remove MSRBL - it seems dead
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=0fcee2b14b2c568300cd8e485b2f5df4169ce90f;p=mirror%2Fdsa-puppet.git

remove MSRBL - it seems dead

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/clamav/files/clamav-unofficial-sigs.dsa.conf b/modules/clamav/files/clamav-unofficial-sigs.dsa.conf
index 2dec7a3da..d1c9beb71 100644
--- a/modules/clamav/files/clamav-unofficial-sigs.dsa.conf
+++ b/modules/clamav/files/clamav-unofficial-sigs.dsa.conf
@@ -20,3 +20,4 @@ si_dbs="
    vx.hdb
 "
 unset mbl_dbs
+unset msrbl_dbs
diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index 47c4109d7..11576b6dd 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -7,7 +7,11 @@ class clamav {
 			ensure => installed
 	}
 
-	file { '/var/lib/clamav/mbl.ndb':
+	file { [
+		'/var/lib/clamav/mbl.ndb',
+		'/var/lib/clamav/MSRBL-Images.hdb',
+		'/var/lib/clamav/MSRBL-SPAM.ndb',
+	]:
 		ensure  => absent
 	}
 	file { '/etc/clamav-unofficial-sigs.dsa.conf':