Merge branch 'master' of git+ssh://zobel@puppet.debian.org/srv/puppet.debian.org...

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

diff --git a/modules/clamav/manifests/init.pp b/modules/clamav/manifests/init.pp
index d8c35a3bae83b43c9cbdc224aff3302cecef8af3..0be36abb98e0652544d0d95b19780a2ffd8289af 100644 (file)
--- a/modules/clamav/manifests/init.pp
+++ b/modules/clamav/manifests/init.pp
@@ -1,30 +1,6 @@
 class clamav {
-    package { "clamav-daemon": ensure => latest;
-              "clamav-freshclam": ensure => latest;
-    }
-
-    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,
+    package { "clamav-daemon": ensure => installed;
+              "clamav-freshclam": ensure => installed;
     }
 }