diff options
| author | Micah Anderson <micah@riseup.net> | 2017-10-07 13:44:50 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-10-07 13:44:50 -0400 |
| commit | 360bafc47dd788301efea0283ac0ae2445859cdc (patch) | |
| tree | fd7b01fbc764a18f55b3957a2e10bac9ee92e3f1 | |
| parent | 98874b796f770d32cd3bea1756b106bd6ed08582 (diff) | |
| parent | fbf45577e210f10c795e275cc41c23b6fc217b83 (diff) | |
Merge branch 'riseup' into leap
| -rw-r--r-- | manifests/daemon/hidden_service.pp | 1 | ||||
| -rw-r--r-- | templates/torrc.hidden_service.erb | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index 07121bd..d91bdc8 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 ) { 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 -%> |