diff options
| author | guido <guido@dis.tur.bio> | 2016-12-22 00:28:32 -0300 |
|---|---|---|
| committer | guido <guido@dis.tur.bio> | 2016-12-22 00:28:32 -0300 |
| commit | 46ceed3ff73a9f33264eef179b0e2a9cf92ad151 (patch) | |
| tree | 9a3a0c5cff33ee9c8c2112bf4e8ec4984972313b | |
| parent | 054c5311fbe235033e325bf68637615d581355aa (diff) | |
Tor's missing config for single hop
| -rw-r--r-- | manifests/daemon/hidden_service.pp | 18 | ||||
| -rw-r--r-- | templates/torrc.hidden_service.erb | 9 |
2 files changed, 19 insertions, 8 deletions
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index b082fe8..b77b790 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -1,9 +1,16 @@ # hidden services definition define tor::daemon::hidden_service( - $ports = [], - $single_hop = false, - $data_dir = $tor::daemon::data_dir, - $ensure = present ) { + $ports = [], + $single_hop = false, + $data_dir = $tor::daemon::data_dir, + $ensure = present ) { + + + if $single_hop { + file { "${$data_dir}/${$name}/onion_service_non_anonymous": + ensure => 'present', + } + } concat::fragment { "05.hidden_service.${name}": ensure => $ensure, @@ -11,5 +18,8 @@ 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 dec126d..5b6afe1 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,10 +1,11 @@ -# hidden service <%= @name %> -HiddenServiceDir <%= @data_dir %>/<%= @name %> <% if @single_hop != false %> +HiddenServiceSingleHopMode 1 HiddenServiceNonAnonymousMode 1 -<% else %> -HiddenServiceNonAnonymousMode 0 +SOCKSPort 0 <% end %> + +# hidden service <%= @name %> +HiddenServiceDir <%= @data_dir %>/<%= @name %> <% @ports.each do |port| -%> HiddenServicePort <%= port %> <% end -%> |