X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=3484dcae69d217a47fd1d285c652c05013a42506;hb=650335318c9021ace96b0cb6d49a13c1a472271f;hp=885258bf9f53433282672ee6f41af8df6a408ef1;hpb=5e84d824624cfe40af9a0ca049bbf7fe8c1cdb4b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index 885258bf9..3484dcae6 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,24 +1,50 @@
 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:///modules/clamav/clamav-unofficial-sigs.dsa.conf" ]
-            ;
-        "/etc/clamav-unofficial-sigs.conf":
-            require => Package["clamav-unofficial-sigs"],
-            source  => [ "puppet:///modules/clamav/clamav-unofficial-sigs.conf" ]
-            ;
-        "/var/lib/clamav/mbl.ndb":
-            ensure  => absent,
-            ;
-    }
-}
+	package { [
+			'clamav-daemon',
+			'clamav-freshclam',
+			'clamav-unofficial-sigs'
+		]:
+			ensure => installed
+	}
+
+	$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']
+	}
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+	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'],
+		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' ]
+	}
+
+}