summaryrefslogtreecommitdiff
path: root/puppet/modules/site_nagios
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-09-30 10:40:59 +0000
committervarac <varacanero@zeromail.org>2015-09-30 10:40:59 +0000
commit29d001f6a7f415579147b4bf94b765d39dc119b6 (patch)
treeb6f227631d87e534d8238bafe6506c5192ffe014 /puppet/modules/site_nagios
parent4143b3001754aae28c05464f5ecda48d1faeb00f (diff)
parentf8b2a72aa09fca368d3038efa9100a48126f8ae9 (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_nagios')
-rw-r--r--puppet/modules/site_nagios/manifests/server.pp1
1 files changed, 1 insertions, 0 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp
index cb6c8d95..60a471b7 100644
--- a/puppet/modules/site_nagios/manifests/server.pp
+++ b/puppet/modules/site_nagios/manifests/server.pp
@@ -32,6 +32,7 @@ class site_nagios::server inherits nagios::base {
}
include site_apache::common
+ include site_webapp::common_vhost
include site_apache::module::headers
File ['nagios_htpasswd'] {