diff options
| author | Micah <micah@riseup.net> | 2017-02-10 21:34:29 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2017-02-10 21:34:29 +0000 |
| commit | 5ef29012dccc90e68afc215be9521629a0903bc6 (patch) | |
| tree | b5739d6af4cc36d5ebbcc9f80b3bb9da290696d1 | |
| parent | 1034bf1e0328ab568e62588bb261cc63f21c5e18 (diff) | |
| parent | 9c7d45201a81d46d2cb829d4eab5d3d65d0c4d88 (diff) | |
Merge branch 'master' into 'master'
hidden services single hop mode support added
See merge request !9
| -rw-r--r-- | manifests/daemon/hidden_service.pp | 15 | ||||
| -rw-r--r-- | templates/torrc.hidden_service.erb | 6 |
2 files changed, 17 insertions, 4 deletions
diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index b54aa44..07121bd 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -1,8 +1,16 @@ # 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 ) { + + + if $single_hop { + file { "${$data_dir}/${$name}/onion_service_non_anonymous": + ensure => 'present', + } + } concat::fragment { "05.hidden_service.${name}": ensure => $ensure, @@ -11,4 +19,3 @@ define tor::daemon::hidden_service( target => $tor::daemon::config_file, } } - diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb index 4dec0b2..5b6afe1 100644 --- a/templates/torrc.hidden_service.erb +++ b/templates/torrc.hidden_service.erb @@ -1,3 +1,9 @@ +<% if @single_hop != false %> +HiddenServiceSingleHopMode 1 +HiddenServiceNonAnonymousMode 1 +SOCKSPort 0 +<% end %> + # hidden service <%= @name %> HiddenServiceDir <%= @data_dir %>/<%= @name %> <% @ports.each do |port| -%> |