X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=2126e8ef721ddb1e80bb299e2d4c75faec3550e4;hb=74228f95e562156c74e302c33d5c2692c0c31564;hp=11576b6ddfe72749cb9867b69beabd7d4aeb1e66;hpb=0fcee2b14b2c568300cd8e485b2f5df4169ce90f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index 11576b6dd..2126e8ef7 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: clamav
+#
+# Manage a clamav installation
+#
+# == Sample Usage:
+#
+#   include clamav
+#
 class clamav {
 	package { [
 			'clamav-daemon',
@@ -7,12 +15,42 @@ class clamav {
 			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
+		ensure => absent,
+		notify => Service['clamav-daemon']
+	}
+	file { '/var/lib/clamav/.nobackup':
+		owner   => clamav,
+		mode    => '0644',
+		content => '',
+		require => Package['clamav-daemon']
 	}
 	file { '/etc/clamav-unofficial-sigs.dsa.conf':
 		require => Package['clamav-unofficial-sigs'],
@@ -22,5 +60,11 @@ class clamav {
 		require => Package['clamav-unofficial-sigs'],
 		source  => [ 'puppet:///modules/clamav/clamav-unofficial-sigs.conf' ]
 	}
+	file { '/var/cache/clamav-unofficial-sigs/.nobackup':
+		owner   => clamav,
+		mode    => '0644',
+		content => '',
+		require => Package['clamav-unofficial-sigs']
+	}
 
 }