diff options
| author | varac <varacanero@zeromail.org> | 2015-10-07 10:57:24 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-10-07 10:57:24 +0200 |
| commit | 2b0386bee6525dda705152031d7125bc30b65269 (patch) | |
| tree | 70929c657dd832a78825b138012dc0cb9c7af9f3 /puppet/modules/site_config | |
| parent | 38f3de0b04c6acabefa801ca368186f35c7a9deb (diff) | |
[bug] Fix removal of webapp apache config file
Done by including a service-dependend site_config::remove::webapp
class.
Diffstat (limited to 'puppet/modules/site_config')
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/files.pp | 17 | ||||
| -rw-r--r-- | puppet/modules/site_config/manifests/remove/webapp.pp | 7 |
2 files changed, 7 insertions, 17 deletions
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp index 66647d31..466f50c8 100644 --- a/puppet/modules/site_config/manifests/remove/files.pp +++ b/puppet/modules/site_config/manifests/remove/files.pp @@ -12,16 +12,6 @@ class site_config::remove::files { # - # Platform 0.8 removals - # - - tidy { - '/etc/apache/sites-enabled/leap_webapp.conf': - notify => Service['apache']; - } - - - # # Platform 0.7 removals # @@ -44,13 +34,6 @@ class site_config::remove::files { '/etc/leap/soledad-server.conf':; } - 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 diff --git a/puppet/modules/site_config/manifests/remove/webapp.pp b/puppet/modules/site_config/manifests/remove/webapp.pp new file mode 100644 index 00000000..58f59815 --- /dev/null +++ b/puppet/modules/site_config/manifests/remove/webapp.pp @@ -0,0 +1,7 @@ +# remove leftovers on webapp nodes +class site_config::remove::webapp { + tidy { + '/etc/apache/sites-enabled/leap_webapp.conf': + notify => Service['apache']; + } +} |