X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=11576b6ddfe72749cb9867b69beabd7d4aeb1e66;hb=0fcee2b14b2c568300cd8e485b2f5df4169ce90f;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..11576b6dd 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,26 @@
 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"]
-          ;
-    }
+	file { [
+		'/var/lib/clamav/mbl.ndb',
+		'/var/lib/clamav/MSRBL-Images.hdb',
+		'/var/lib/clamav/MSRBL-SPAM.ndb',
+	]:
+		ensure  => absent
+	}
+	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' ]
+	}
 
-    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,
-    }
 }
-