diff options
Diffstat (limited to 'puppet/modules')
| -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 | 
