summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-12-01 09:32:03 +0100
committervarac <varacanero@zeromail.org>2015-12-01 09:32:03 +0100
commit78cb07746c1e990374b92b5ea492b2ac63210f8e (patch)
tree99da2882780c692a3d2f71e51122b06c80eb69c0 /puppet/modules
parente15e37d6ed83df62ebdae14d925c6aaab0daf9af (diff)
parent8a07c4d039eef1b73d9d03d4be215a43b255bfc4 (diff)
Merge branch 'develop' of ssh://code.leap.se/leap_platform into develop
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/site_static/manifests/init.pp10
-rw-r--r--puppet/modules/site_webapp/manifests/hidden_service.pp1
2 files changed, 7 insertions, 4 deletions
diff --git a/puppet/modules/site_static/manifests/init.pp b/puppet/modules/site_static/manifests/init.pp
index 8df53075..e317f580 100644
--- a/puppet/modules/site_static/manifests/init.pp
+++ b/puppet/modules/site_static/manifests/init.pp
@@ -28,10 +28,12 @@ class site_static {
}
}
- include site_apache::module::headers
- include site_apache::module::alias
- include site_apache::module::expires
- include site_apache::module::removeip
+ include apache::module::headers
+ include apache::module::alias
+ include apache::module::expires
+ include apache::module::removeip
+ include apache::module::dir
+ include apache::module::negotiation
include site_apache::common
include site_config::ruby::dev
diff --git a/puppet/modules/site_webapp/manifests/hidden_service.pp b/puppet/modules/site_webapp/manifests/hidden_service.pp
index 4cf7a8ca..efdefd8e 100644
--- a/puppet/modules/site_webapp/manifests/hidden_service.pp
+++ b/puppet/modules/site_webapp/manifests/hidden_service.pp
@@ -8,6 +8,7 @@ class site_webapp::hidden_service {
include apache::module::alias
include apache::module::expires
include apache::module::removeip
+ include apache::module::status
include tor::daemon
tor::daemon::hidden_service { 'webapp': ports => '80 127.0.0.1:80' }