summaryrefslogtreecommitdiff
path: root/puppet/modules/clamav
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-08 20:50:04 +0200
committervarac <varacanero@zeromail.org>2016-09-08 20:50:04 +0200
commit4ced0625250b82c725d6890e49cd24a20b856d40 (patch)
treec3078dc4cf18de3dbee906d7ad779733bae54c96 /puppet/modules/clamav
parent8cb40d25f3e74b37c47b0c265b346f9de860aa77 (diff)
parentd6e6b05c093bf6e3c2abc5dc40cda466760b5f32 (diff)
Merge branch 'clamd_dependencies' into develop
Diffstat (limited to 'puppet/modules/clamav')
-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 b51a07e9..322cb892 100644
--- a/puppet/modules/clamav/manifests/daemon.pp
+++ b/puppet/modules/clamav/manifests/daemon.pp
@@ -16,7 +16,6 @@ class clamav::daemon {
pattern => '/usr/sbin/clamd',
enable => true,
hasrestart => true,
- subscribe => File['/etc/default/clamav-daemon'],
require => Package['clamav-daemon'];
}
@@ -26,19 +25,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)
@@ -47,7 +50,8 @@ class clamav::daemon {
mode => '0644',
owner => clamav,
group => clamav,
- require => Package['clamav-daemon'];
+ require => Package['clamav-daemon'],
+ notify => Service['clamav-daemon'];
}
file_line {