X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=3484dcae69d217a47fd1d285c652c05013a42506;hb=e256acb16ebf1953ebe88eafab92e359adf4558b;hp=fa7e17ecf85425f11ff01391a7c0cbefb3ca54bc;hpb=f72074b094219c67c9a77ff84eda49885ded97b9;p=dsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index fa7e17ec..3484dcae 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,17 +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:///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
+	}
+
+	$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'],
+		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' ]
+	}
+
+}