From d6e6b05c093bf6e3c2abc5dc40cda466760b5f32 Mon Sep 17 00:00:00 2001 From: varac Date: Wed, 7 Sep 2016 10:44:57 +0200 Subject: Fix dependencies for clamd service Sometimes, after a deploy from scratch `leap test` fails because clamd could not get started (even when the deploy log says so). This fixes the dependencies of all resources needed in order to let clamd start reliable. Resolves: #8431 --- puppet/modules/clamav/manifests/daemon.pp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'puppet/modules/clamav/manifests/daemon.pp') diff --git a/puppet/modules/clamav/manifests/daemon.pp b/puppet/modules/clamav/manifests/daemon.pp index 2e13a8fb..c0a4a450 100644 --- a/puppet/modules/clamav/manifests/daemon.pp +++ b/puppet/modules/clamav/manifests/daemon.pp @@ -15,7 +15,6 @@ class clamav::daemon { pattern => '/usr/sbin/clamd', enable => true, hasrestart => true, - subscribe => File['/etc/default/clamav-daemon'], require => Package['clamav-daemon']; } @@ -25,19 +24,23 @@ class clamav::daemon { mode => '0750', owner => clamav, group => postfix, - require => [Package['postfix'], Package['clamav-daemon']]; + require => [Package['postfix'], Package['clamav-daemon']], + notify => Service['clamav-daemon']; '/var/lib/clamav': mode => '0755', owner => clamav, group => clamav, - require => Package['clamav-daemon']; + require => Package['clamav-daemon'], + notify => Service['clamav-daemon']; '/etc/default/clamav-daemon': - source => 'puppet:///modules/clamav/clamav-daemon_default', - mode => '0644', - owner => root, - group => root; + source => 'puppet:///modules/clamav/clamav-daemon_default', + mode => '0644', + owner => root, + group => root, + require => Package['clamav-daemon'], + notify => Service['clamav-daemon']; # this file contains additional domains that we want the clamav # phishing process to look for (our domain) @@ -46,7 +49,8 @@ class clamav::daemon { mode => '0644', owner => clamav, group => clamav, - require => Package['clamav-daemon']; + require => Package['clamav-daemon'], + notify => Service['clamav-daemon']; } file_line { -- cgit v1.2.3 From a3af8acba8cd479f47d76784082d95100c0833ef Mon Sep 17 00:00:00 2001 From: Christoph Kluenter Date: Wed, 7 Sep 2016 15:36:54 +0200 Subject: start clamav after definitions are downloaded freshclam might not be able to start clamav via the socket because the socket might not be there. This systemd unit watches for the definitions and then starts clamav. Resolves: #8431 --- puppet/modules/clamav/manifests/daemon.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'puppet/modules/clamav/manifests/daemon.pp') diff --git a/puppet/modules/clamav/manifests/daemon.pp b/puppet/modules/clamav/manifests/daemon.pp index 2e13a8fb..b51a07e9 100644 --- a/puppet/modules/clamav/manifests/daemon.pp +++ b/puppet/modules/clamav/manifests/daemon.pp @@ -1,5 +1,6 @@ # deploy clamav daemon class clamav::daemon { + include clamav::daemon::activation $domain_hash = hiera('domain') $domain = $domain_hash['full_suffix'] -- cgit v1.2.3