diff options
author | Micah Anderson <micah@riseup.net> | 2017-10-24 09:52:41 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2017-10-24 09:52:41 -0400 |
commit | d25d23daf5e2185503ba6578523bc072ffe56b84 (patch) | |
tree | b65ecff455b4a3fd93dc072e9819206734106515 /puppet/modules/tor/templates | |
parent | a96fefa7cf9f9583adf5c152c19f53c8bdeca167 (diff) | |
parent | 3478b7b46087971f4396de3ea370741694963ca9 (diff) |
Merge remote-tracking branch 'my0xacab/feat/v3_hs'
Diffstat (limited to 'puppet/modules/tor/templates')
-rw-r--r-- | puppet/modules/tor/templates/torrc.directory.erb | 2 | ||||
-rw-r--r-- | puppet/modules/tor/templates/torrc.hidden_service.erb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/puppet/modules/tor/templates/torrc.directory.erb b/puppet/modules/tor/templates/torrc.directory.erb index c7dc4ab5..23ed3392 100644 --- a/puppet/modules/tor/templates/torrc.directory.erb +++ b/puppet/modules/tor/templates/torrc.directory.erb @@ -2,7 +2,7 @@ <% if @port != '0' -%> DirPort <%= @port %> <% end -%> -<% listen_addresses.each do |listen_address| -%> +<% @listen_addresses.each do |listen_address| -%> DirListenAddress <%= listen_address %> <% end -%> <% if @port_front_page != '' -%> diff --git a/puppet/modules/tor/templates/torrc.hidden_service.erb b/puppet/modules/tor/templates/torrc.hidden_service.erb index 5b6afe1c..8a691c6b 100644 --- a/puppet/modules/tor/templates/torrc.hidden_service.erb +++ b/puppet/modules/tor/templates/torrc.hidden_service.erb @@ -10,3 +10,11 @@ HiddenServiceDir <%= @data_dir %>/<%= @name %> HiddenServicePort <%= port %> <% end -%> +<% if @v3 != false %> +# hidden service v3 static +HiddenServiceDir <%= @data_dir %>/<%= @name -%>3 +HiddenServiceVersion 3 +<% @ports.each do |port| -%> +HiddenServicePort <%= port %> +<% end -%> +<% end -%> |