summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguido <guido@dis.tur.bio>2015-10-20 21:31:46 +0000
committerguido <guido@dis.tur.bio>2015-10-20 21:31:46 +0000
commit055a8319c90def2d48ce36a2c27383aa78b11179 (patch)
tree4392e915edb01ea1d3da185422c3a7d82f7e0c3c
parent4656fd5629b9d467ac2a2a98fb075c644c09c408 (diff)
parent1ade690d20618ca5adb0c4a1647b36200197fd26 (diff)
Merge branch 'bug/7546' into 'develop'
Provide tor hidden service configuration for static sites (#7546) Without this configuration, a very basic, and non-functional virtualhost is created, making the hidden service not work Change-Id: Ibe87c6acf5c21cff2388247c4ba320a5b6af7933 See merge request !81
-rw-r--r--puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb10
1 files changed, 10 insertions, 0 deletions
diff --git a/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb b/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb
index 0c6f3b8e..2c8d5eb5 100644
--- a/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb
+++ b/puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb
@@ -30,4 +30,14 @@
ExpiresDefault "access plus 1 year"
</Location>
<% end -%>
+
+<% if (defined? @services) and (@services.include? 'static') -%>
+ DocumentRoot "/srv/static/root/public"
+ AccessFileName .htaccess
+
+ Alias /provider.json /srv/leap/provider.json
+ <Location /provider.json>
+ Header set X-Minimum-Client-Version 0.5
+ </Location>
+<% end -%>
</VirtualHost>