summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-10-07 10:39:59 +0200
committervarac <varacanero@zeromail.org>2015-10-07 10:39:59 +0200
commit38f3de0b04c6acabefa801ca368186f35c7a9deb (patch)
tree64c83cecbfda57d7d6e3cab7783e159fec3fc4b1 /puppet/modules
parentb1e50fc76ddece9944ae253da9bacd485ffea84b (diff)
parentba83f41108fc445cc6ba6e2b5c8e6cc21c1a49e4 (diff)
Merge branch 'develop' of gitlab.com:leap/platform into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_config/manifests/remove/files.pp7
1 files changed, 7 insertions, 0 deletions
diff --git a/puppet/modules/site_config/manifests/remove/files.pp b/puppet/modules/site_config/manifests/remove/files.pp
index feff7c05..66647d31 100644
--- a/puppet/modules/site_config/manifests/remove/files.pp
+++ b/puppet/modules/site_config/manifests/remove/files.pp
@@ -44,6 +44,13 @@ 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