From fbf45577e210f10c795e275cc41c23b6fc217b83 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sat, 7 Oct 2017 13:39:12 -0400 Subject: add v3 hidden service support --- manifests/daemon/hidden_service.pp | 4 +--- templates/torrc.hidden_service.erb | 6 ++++++ 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 -%> -- cgit v1.2.3