X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=fa7e17ecf85425f11ff01391a7c0cbefb3ca54bc;hb=2044f7ab32a2999b31636c3139e5ed059b7ec69a;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..fa7e17ecf 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,17 @@
 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"]
+        "/etc/clamav-unofficial-sigs.dsa.conf":
+          require => Package["clamav-unofficial-sigs"],
+          source  => [ "puppet:///clamav/clamav-unofficial-sigs.dsa.conf" ]
           ;
-    }
-
-    file {
-        "/etc/clamav/freshclam.conf":
-          source  => "puppet:///clamav/freshclam.conf",
-          require => Package["clamav-freshclam"],
-          notify  => Exec["clamav-freshclam restart"]
+        "/etc/clamav-unofficial-sigs.conf":
+          require => Package["clamav-unofficial-sigs"],
+          source  => [ "puppet:///clamav/clamav-unofficial-sigs.conf" ]
           ;
     }
-    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,
-    }
 }