diff options
| author | varac <varacanero@zeromail.org> | 2015-09-30 10:40:59 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2015-09-30 10:40:59 +0000 |
| commit | 29d001f6a7f415579147b4bf94b765d39dc119b6 (patch) | |
| tree | b6f227631d87e534d8238bafe6506c5192ffe014 /puppet/modules/site_webapp/manifests/apache.pp | |
| parent | 4143b3001754aae28c05464f5ecda48d1faeb00f (diff) | |
| parent | f8b2a72aa09fca368d3038efa9100a48126f8ae9 (diff) | |
Merge branch 'bug/server-status_7456' into 'develop'
Fix server-status availability to tor hidden services (#7456)
Make the server-status information unavailable by putting the vhost on a
port that isn't configured as available to the tor hidden-service.
Change-Id: Idd3bfefb5b7fc26fb0a8cf48cdf6afc68a4192bb
See merge request !73
Diffstat (limited to 'puppet/modules/site_webapp/manifests/apache.pp')
| -rw-r--r-- | puppet/modules/site_webapp/manifests/apache.pp | 3 |
1 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 93e172a0..ddd04a91 100644 --- a/puppet/modules/site_webapp/manifests/apache.pp +++ b/puppet/modules/site_webapp/manifests/apache.pp @@ -15,12 +15,13 @@ class site_webapp::apache { include site_apache::module::alias include site_apache::module::expires include site_apache::module::removeip + include site_webapp::common_vhost class { 'passenger': use_munin => false } apache::vhost::file { 'api': - content => template('site_apache/vhosts.d/api.conf.erb') + content => template('site_apache/vhosts.d/api.conf.erb'); } } |