From ba7b1963586be4be002f562c380a9e7410d533b5 Mon Sep 17 00:00:00 2001 From: paustin01 Date: Tue, 1 Jul 2014 10:42:03 -0700 Subject: [PATCH] Add resource to manage version of freshclam package installed as well --- recipes/install_deb.rb | 13 +++++++++++++ spec/unit/recipes/install_deb_spec.rb | 2 +- .../default/serverspec/localhost/packages_spec.rb | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/recipes/install_deb.rb b/recipes/install_deb.rb index acf2efd..e6d3836 100644 --- a/recipes/install_deb.rb +++ b/recipes/install_deb.rb @@ -59,6 +59,19 @@ only_if { node['clamav']['dev_package'] } end +package 'clamav-freshclam' do + action :install + version node['clamav']['version'] if node['clamav']['version'] + if node['clamav']['clamd']['enabled'] + notifies :restart, + "service[#{node['clamav']['clamd']['service']}]" + end + if node['clamav']['freshclam']['enabled'] + notifies :restart, + "service[#{node['clamav']['freshclam']['service']}]" + end +end + files = %w(/etc/logrotate.d/clamav-daemon /etc/logrotate.d/clamav-freshclam) files.each do |f| file f do diff --git a/spec/unit/recipes/install_deb_spec.rb b/spec/unit/recipes/install_deb_spec.rb index 7b819f0..3f30fa7 100644 --- a/spec/unit/recipes/install_deb_spec.rb +++ b/spec/unit/recipes/install_deb_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' describe 'clamav::install_deb' do - let(:packages) { %w(clamav clamav-daemon) } + let(:packages) { %w(clamav clamav-daemon clamav-freshclam) } let(:clamd_service) { 'service[clamav-daemon]' } let(:freshclam_service) { 'service[clamav-freshclam]' } let(:attributes) { {} } diff --git a/test/integration/default/serverspec/localhost/packages_spec.rb b/test/integration/default/serverspec/localhost/packages_spec.rb index 095a286..4b7685d 100644 --- a/test/integration/default/serverspec/localhost/packages_spec.rb +++ b/test/integration/default/serverspec/localhost/packages_spec.rb @@ -6,7 +6,7 @@ let(:packages) do case @node['platform_family'] when 'debian' - %w(clamav clamav-daemon) + %w(clamav clamav-daemon clamav-freshclam) else %w(clamav clamav-db clamd) end