diff options
author | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2014-01-31 17:19:46 +0100 |
commit | 37e3c260f026a66b37f54cd6092ee2c28d262247 (patch) | |
tree | f1bca78de1e368b97332356928710257fe3c6a42 /puppet/modules/site_webapp/manifests | |
parent | e94ae94dd01cd256f89fb079cfca75a487dceed5 (diff) | |
parent | ca1c07ad510ec24037b9fd4baad1a57b26eabedc (diff) |
Merge branch 'develop' into 0.6
Diffstat (limited to 'puppet/modules/site_webapp/manifests')
-rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 1 | ||||
-rw-r--r-- | puppet/modules/site_webapp/manifests/couchdb.pp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/puppet/modules/site_webapp/manifests/apache.pp b/puppet/modules/site_webapp/manifests/apache.pp index 581922cb..d327877a 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -22,6 +22,7 @@ class site_webapp::apache { include site_apache::module::rewrite include site_apache::module::alias include site_apache::module::expires + include site_apache::module::removeip class { 'passenger': use_munin => false } diff --git a/puppet/modules/site_webapp/manifests/couchdb.pp b/puppet/modules/site_webapp/manifests/couchdb.pp index 7f6ebbc6..ff743fba 100644 --- a/puppet/modules/site_webapp/manifests/couchdb.pp +++ b/puppet/modules/site_webapp/manifests/couchdb.pp @@ -14,7 +14,7 @@ class site_webapp::couchdb { include x509::variables file { - '/srv/leap/webapp/config/couchdb.yml.webapp': + '/srv/leap/webapp/config/couchdb.yml': content => template('site_webapp/couchdb.yml.erb'), owner => leap-webapp, group => leap-webapp, |