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

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index d8c35a3ba..3484dcae6 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,50 @@
 class clamav {
-    package { "clamav-daemon": ensure => latest;
-              "clamav-freshclam": ensure => latest;
-    }
+	package { [
+			'clamav-daemon',
+			'clamav-freshclam',
+			'clamav-unofficial-sigs'
+		]:
+			ensure => installed
+	}
 
-    file {
-        "/etc/clamav/clamd.conf":
-          source  => "puppet:///clamav/clamd.conf",
-          require => Package["clamav-daemon"],
-          notify  => Exec["clamav-daemon restart"]
-          ;
-    }
+	$extra_groups = $::mta ? {
+		'postfix' => 'amavis',
+		default   => 'Debian-exim'
+	}
 
-    file {
-        "/etc/clamav/freshclam.conf":
-          source  => "puppet:///clamav/freshclam.conf",
-          require => Package["clamav-freshclam"],
-          notify  => Exec["clamav-freshclam restart"]
-          ;
-    }
-    exec { "clamav-daemon restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    exec { "clamav-freshclam restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-}
+	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' ]
+	}
+
+}