summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--puppet/modules/tor/.gitrepo6
-rw-r--r--puppet/modules/tor/manifests/daemon/hidden_service.pp1
-rw-r--r--puppet/modules/tor/templates/torrc.directory.erb2
-rw-r--r--puppet/modules/tor/templates/torrc.hidden_service.erb8
4 files changed, 13 insertions, 4 deletions
diff --git a/puppet/modules/tor/.gitrepo b/puppet/modules/tor/.gitrepo
index 5e3e3c1f..ea3c1495 100644
--- a/puppet/modules/tor/.gitrepo
+++ b/puppet/modules/tor/.gitrepo
@@ -6,6 +6,6 @@
[subrepo]
remote = https://leap.se/git/puppet_tor
branch = master
- commit = 5ef29012dccc90e68afc215be9521629a0903bc6
- parent = 747d3e9b55c8b7b7d98a63474b6de82d7114c389
- cmdver = 0.4.0
+ commit = 4380e2eabd94d8f0df7f63c642dd46ec4783ef07
+ parent = be4182d7227d57b4da20d088b4750c756f759888
+ cmdver = 0.3.1
diff --git a/puppet/modules/tor/manifests/daemon/hidden_service.pp b/puppet/modules/tor/manifests/daemon/hidden_service.pp
index 07121bd6..d91bdc89 100644
--- a/puppet/modules/tor/manifests/daemon/hidden_service.pp
+++ b/puppet/modules/tor/manifests/daemon/hidden_service.pp
@@ -2,6 +2,7 @@
define tor::daemon::hidden_service(
$ports = [],
$single_hop = false,
+ $v3 = false,
$data_dir = $tor::daemon::data_dir,
$ensure = present ) {
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 -%>