Specify mapnik version for CartoCSS

[chef.git] / cookbooks / clamav / recipes / default.rb

diff --git a/cookbooks/clamav/recipes/default.rb b/cookbooks/clamav/recipes/default.rb
index 3c95527ce3ea6bcf569b297a57ae3a8d9837c4f1..938b2f5aba0c1caa72e448623ba894b8b494162d 100644 (file)
--- a/cookbooks/clamav/recipes/default.rb
+++ b/cookbooks/clamav/recipes/default.rb
@@ -17,6 +17,8 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"
+

 package %w[
   clamav-daemon
   clamav-freshclam
 package %w[
   clamav-daemon
   clamav-freshclam


@@ -27,14 +29,17 @@ template "/etc/clamav-unofficial-sigs.conf.d/50-chef.conf" do
   source "clamav-unofficial-sigs.conf.erb"
   owner "root"
   group "root"
   source "clamav-unofficial-sigs.conf.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 execute "freshclam" do
   command "/usr/bin/freshclam"
   user "clamav"
   group "clamav"
 end
 
 execute "freshclam" do
   command "/usr/bin/freshclam"
   user "clamav"
   group "clamav"

-  not_if { ::File.exist?("/var/lib/clamav/daily.cvd") }
+  not_if do
+    ::File.exist?("/var/lib/clamav/daily.cld") ||
+      ::File.exist?("/var/lib/clamav/daily.cvd")
+  end

 end
 
 service "clamav-daemon" do
 end
 
 service "clamav-daemon" do