X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fclamav%2Fmanifests%2Finit.pp;h=fa7e17ecf85425f11ff01391a7c0cbefb3ca54bc;hb=f72074b094219c67c9a77ff84eda49885ded97b9;hp=f32805d98b94724c4059291a19c5aeff0a902ba6;hpb=c4718c4edcce0add4fea04db5eb2fc4bf808c8cf;p=mirror%2Fdsa-puppet.git

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index f32805d98..fa7e17ecf 100644
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,17 @@
 class clamav {
     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,
-    }
 }