remove MSRBL - it seems dead

[mirror/dsa-puppet.git] / modules / clamav / manifests / init.pp

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index c2bd0d1..11576b6 100644 (file)
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,21 +1,26 @@
 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" ]
-            ;
-    }
-}
+       package { [
+                       'clamav-daemon',
+                       'clamav-freshclam',
+                       'clamav-unofficial-sigs'
+               ]:
+                       ensure => installed
+       }
+
+       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' ]
+       }
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+}