diff options
| author | Micah <micah@leap.se> | 2016-06-23 12:08:54 -0400 |
|---|---|---|
| committer | Micah <micah@leap.se> | 2016-08-25 15:13:05 -0400 |
| commit | fc78e094919257f523707ec02d897505d7107699 (patch) | |
| tree | 67747ebcf196abbb07793a832642a548a78872d2 /puppet/modules/site_apache | |
| parent | f0e3e302ac6235c5c3c881983926f58084f211e8 (diff) | |
Make static tor hidden services work (#8212).
When tor hidden services were enabled for static sites, only a very
basic configuration was setup and it didn't take into account the
different location configurations that can be configured for a
static site.
This commit resolves that by making a site_static::hidden_service class
similar to the site_webapp::hidden_service class, and fixes up the
apache vhost template to properly create the location blocks for the
hidden service vhost.
Change-Id: Ice3586f4173bd2d1bd3defca29d21c7403d5a03a
Diffstat (limited to 'puppet/modules/site_apache')
| -rw-r--r-- | puppet/modules/site_apache/templates/vhosts.d/hidden_service.conf.erb | 15 |
1 files changed, 0 insertions, 15 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 697a7ff3..1d19094e 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 @@ -37,19 +37,4 @@ </Location> <% end -%> -<% if (defined? @services) and (@services.include? 'static') -%> - DocumentRoot "/srv/static/root/public" - <% if scope.function_guess_apache_version([]) == '2.4' %> - <Directory /srv/static/root/public> - AllowOverride FileInfo Indexes Options=All,MultiViews - Require all granted - </Directory> - <% end %> - AccessFileName .htaccess - - Alias /provider.json /srv/leap/provider.json - <Location /provider.json> - Header set X-Minimum-Client-Version 0.5 - </Location> -<% end -%> </VirtualHost> |