X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=3484dcae69d217a47fd1d285c652c05013a42506;hb=650335318c9021ace96b0cb6d49a13c1a472271f;hp=47c4109d7d2d6491af236913876338fbdf16a707;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index 47c4109d7..3484dcae6 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -7,8 +7,36 @@ class clamav {
 			ensure => installed
 	}
 
-	file { '/var/lib/clamav/mbl.ndb':
-		ensure  => absent
+	$extra_groups = $::mta ? {
+		'postfix' => 'amavis',
+		default   => 'Debian-exim'
+	}
+
+	user { 'clamav':
+		gid     => clamav,
+		groups  => [$extra_groups],
+		require => Package['clamav-daemon']
+	}
+
+	service { 'clamav-daemon':
+		ensure  => running,
+		require => Package['clamav-daemon']
+	}
+
+	service { 'clamav-freshclam':
+		ensure  => running,
+		require => Package['clamav-freshclam']
+	}
+
+	file { [
+		'/var/lib/clamav/mbl.ndb',
+		'/var/lib/clamav/MSRBL-Images.hdb',
+		'/var/lib/clamav/MSRBL-SPAM.ndb',
+		'/var/lib/clamav/msrbl-images.hdb',
+		'/var/lib/clamav/msrbl-spam.ndb',
+	]:
+		ensure => absent,
+		notify => Service['clamav-daemon']
 	}
 	file { '/etc/clamav-unofficial-sigs.dsa.conf':
 		require => Package['clamav-unofficial-sigs'],