Use backport of cgi-mapserver

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

diff --git a/cookbooks/clamav/recipes/default.rb b/cookbooks/clamav/recipes/default.rb
index 41f877118f01782cf08b7db3271f6fb6c776e77d..938b2f5aba0c1caa72e448623ba894b8b494162d 100644 (file)
--- a/cookbooks/clamav/recipes/default.rb
+++ b/cookbooks/clamav/recipes/default.rb
@@ -1,8 +1,8 @@
 #
 #

-# Cookbook Name:: clamav
+# Cookbook:: clamav

 # Recipe:: default
 #
 # Recipe:: default
 #

-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -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,7 +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"
+  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