From: Tom Hughes <tom@compton.nu>
Date: Thu, 13 Feb 2020 22:54:31 +0000 (+0000)
Subject: Improve check for whether to run freshclam
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fa71c73145311f316cd8435602b4027aaa88d620

Improve check for whether to run freshclam
---

diff --git a/cookbooks/clamav/recipes/default.rb b/cookbooks/clamav/recipes/default.rb
index 3c95527ce..bbfc2cd68 100644
--- a/cookbooks/clamav/recipes/default.rb
+++ b/cookbooks/clamav/recipes/default.rb
@@ -34,7 +34,10 @@ 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