X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=47c4109d7d2d6491af236913876338fbdf16a707;hb=107a00c9b97e8ba32c823c510bbbe8b747290963;hp=fa7e17ecf85425f11ff01391a7c0cbefb3ca54bc;hpb=2044f7ab32a2999b31636c3139e5ed059b7ec69a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index fa7e17ecf..47c4109d7 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,17 +1,22 @@
 class clamav {
-    package { "clamav-daemon": ensure => installed;
-              "clamav-freshclam": ensure => installed;
-              "clamav-unofficial-sigs": ensure => installed;
-    }
-    file {
-        "/etc/clamav-unofficial-sigs.dsa.conf":
-          require => Package["clamav-unofficial-sigs"],
-          source  => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ]
-          ;
-        "/etc/clamav-unofficial-sigs.conf":
-          require => Package["clamav-unofficial-sigs"],
-          source  => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ]
-          ;
-    }
-}
+	package { [
+			'clamav-daemon',
+			'clamav-freshclam',
+			'clamav-unofficial-sigs'
+		]:
+			ensure => installed
+	}
+
+	file { '/var/lib/clamav/mbl.ndb':
+		ensure  => absent
+	}
+	file { '/etc/clamav-unofficial-sigs.dsa.conf':
+		require => Package['clamav-unofficial-sigs'],
+		source  => [ 'puppet:///modules/clamav/clamav-unofficial-sigs.dsa.conf' ]
+	}
+	file { '/etc/clamav-unofficial-sigs.conf':
+		require => Package['clamav-unofficial-sigs'],
+		source  => [ 'puppet:///modules/clamav/clamav-unofficial-sigs.conf' ]
+	}
 
+}