X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=885258bf9f53433282672ee6f41af8df6a408ef1;hb=f70c7c4d85fd0ef28fbfd93cca4011d4e6f033a8;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..885258bf9 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,24 @@
 class clamav {
-    package { "clamav-daemon": ensure => latest;
-              "clamav-freshclam": ensure => latest;
+    package {
+        "clamav-daemon": ensure => installed;
+        "clamav-freshclam": ensure => installed;
+        "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 {
-        "/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,
+        "/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" ]
+            ;
+        "/var/lib/clamav/mbl.ndb":
+            ensure  => absent,
+            ;
     }
 }
 
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: