diff options
| author | guido <guido@dis.tur.bio> | 2016-12-21 21:16:12 -0300 |
|---|---|---|
| committer | guido <guido@dis.tur.bio> | 2016-12-21 21:16:12 -0300 |
| commit | 054c5311fbe235033e325bf68637615d581355aa (patch) | |
| tree | 6e8f11deda535ac4e97f32fa93e4f29cd8d0275d | |
| parent | 396e5d888882a9511df673d51f0af78998ef9b26 (diff) | |
support for single_hop onion services added
| -rw-r--r-- | manifests/daemon/hidden_service.pp | 10 | ||||
| -rw-r--r-- | templates/torrc.hidden_service.erb | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index c827211..b082fe8 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -1,15 +1,13 @@ # hidden services definition define tor::daemon::hidden_service( - $ports = [], - $data_dir = $tor::daemon::data_dir, - $ensure = present ) { + $ports = [], + $single_hop = false, + $data_dir = $tor::daemon::data_dir, + $ensure = present ) { concat::fragment { "05.hidden_service.${name}": ensure => $ensure, content => template('tor/torrc.hidden_service.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 05, target => $tor::daemon::config_file, } diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb index 4dec0b2..dec126d 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,5 +1,10 @@ # hidden service <%= @name %> HiddenServiceDir <%= @data_dir %>/<%= @name %> +<% if @single_hop != false %> +HiddenServiceNonAnonymousMode 1 +<% else %> +HiddenServiceNonAnonymousMode 0 +<% end %> <% @ports.each do |port| -%> HiddenServicePort <%= port %> <% end -%> |