summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2017-10-07 13:39:12 -0400
committerMicah Anderson <micah@riseup.net>2017-10-07 13:39:12 -0400
commitfbf45577e210f10c795e275cc41c23b6fc217b83 (patch)
tree8e206363b191bcf0a22c0a75a9ed54572388a43c
parente67fdf5179227ecfd7ea3907b455f4d99eb49ab8 (diff)
add v3 hidden service support
-rw-r--r--manifests/daemon/hidden_service.pp4
-rw-r--r--templates/torrc.hidden_service.erb6
2 files changed, 7 insertions, 3 deletions
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp
index b77b790..02ddf25 100644
--- a/manifests/daemon/hidden_service.pp
+++ b/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 ) {
@@ -18,8 +19,5 @@ define tor::daemon::hidden_service(
order => 05,
target => $tor::daemon::config_file,
}
-
-
-
}
diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index 5b6afe1..bedbe18 100644
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -10,3 +10,9 @@ HiddenServiceDir <%= @data_dir %>/<%= @name %>
HiddenServicePort <%= port %>
<% end -%>
+<% if @v3 != false %>
+# hidden service v3 static
+HiddenServiceDir <%= @data_dir %>/<%= @name -%>3
+HiddenServiceVersion 3
+HiddenServicePort <%= port %>
+<% end -%>