summaryrefslogtreecommitdiff
path: root/puppet/modules/tor/templates
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-10-07 14:04:02 -0400
committerMicah Anderson <micah@riseup.net>2017-10-07 14:12:34 -0400
commit3478b7b46087971f4396de3ea370741694963ca9 (patch)
tree6bd8556ead06514f29b5e949fe7d00c0ac5775c6 /puppet/modules/tor/templates
parent414e36cf11364a9e581eb260b3267078b6cdda44 (diff)
git subrepo pull puppet/modules/tor
subrepo: subdir: "puppet/modules/tor" merged: "4380e2ea" upstream: origin: "https://leap.se/git/puppet_tor" branch: "master" commit: "4380e2ea" git-subrepo: version: "0.3.1" origin: "https://github.com/ingydotnet/git-subrepo" commit: "a7ee886"
Diffstat (limited to 'puppet/modules/tor/templates')
-rw-r--r--puppet/modules/tor/templates/torrc.directory.erb2
-rw-r--r--puppet/modules/tor/templates/torrc.hidden_service.erb8
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 -%>