summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-07 10:44:57 +0200
committervarac <varacanero@zeromail.org>2016-09-07 10:44:57 +0200
commitd6e6b05c093bf6e3c2abc5dc40cda466760b5f32 (patch)
tree6efcf4711fa5289351ece49a51a1bf17bd83fa26 /puppet
parente9e06a8db0becb32656b272156709c12a3a31f17 (diff)
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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/clamav/manifests/daemon.pp20
1 files changed, 12 insertions, 8 deletions
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 {