diff options
| author | elijah <elijah@riseup.net> | 2016-09-02 12:35:09 -0700 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2016-09-13 16:42:36 -0400 |
| commit | a063280eab5e8749c74381aabbe641c30887e9f6 (patch) | |
| tree | 45436172c746bc12517ae54a9b4838653ded18ed /puppet/modules/site_static/templates/apache.conf.erb | |
| parent | 4ced0625250b82c725d6890e49cd24a20b856d40 (diff) | |
[bugfix] static sites: only enable hidden service by default if one domain is configured
The problem is that we have a single onion address per server, so if more
than one domain is configured we need to make sure they don't both try to
use the same onion address.
Diffstat (limited to 'puppet/modules/site_static/templates/apache.conf.erb')
| -rw-r--r-- | puppet/modules/site_static/templates/apache.conf.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/site_static/templates/apache.conf.erb b/puppet/modules/site_static/templates/apache.conf.erb index af9a520d..dd04ca43 100644 --- a/puppet/modules/site_static/templates/apache.conf.erb +++ b/puppet/modules/site_static/templates/apache.conf.erb @@ -74,7 +74,7 @@ Require all granted </Directory> -<%- if @tor -%> +<%- if @tor && (@always_use_hidden_service || @use_hidden_service) -%> ## ## Tor ## |