diff options
| author | varac <varacanero@zeromail.org> | 2015-09-30 08:17:16 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-09-30 08:17:16 +0000 |
| commit | 4143b3001754aae28c05464f5ecda48d1faeb00f (patch) | |
| tree | 9b8e5f127278008fb6ccd32851bfa1e2a2f5de22 | |
| parent | bbc95640557e200a5a4e463f451ed647692dc0a3 (diff) | |
| parent | 4b26c0f30980789844c747e796c12958f51c932c (diff) | |
Merge branch 'develop' into 'develop'
fix missing service dependency error
this tidy should only happen on webapp nodes
Change-Id: I56faac4fa28fde9dcad7ce9a6ed0d684630a556e
See merge request !77
| -rw-r--r-- | puppet/modules/site_config/manifests/remove_files.pp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/remove_files.pp b/puppet/modules/site_config/manifests/remove_files.pp index e2ab3c2e..51d1ea88 100644 --- a/puppet/modules/site_config/manifests/remove_files.pp +++ b/puppet/modules/site_config/manifests/remove_files.pp @@ -23,8 +23,6 @@ class site_config::remove_files { '/etc/logrotate.d/mx':; '/etc/logrotate.d/stunnel':; '/var/log/stunnel4/stunnel.log':; - '/etc/apache/sites-enabled/leap_webapp.conf': - notify => Service['apache']; 'leap_mx': path => '/var/log/', recurse => true, @@ -39,6 +37,13 @@ class site_config::remove_files { rmdirs => true; } + if member($::services, 'webapp') { + tidy { + '/etc/apache/sites-enabled/leap_webapp.conf': + notify => Service['apache']; + } + } + # leax-mx logged to /var/log/leap_mx.log in the past # we need to use a dumb exec here because file_line doesn't # allow removing lines that match a regex in the current version |