diff options
| author | Micah Anderson <micah@riseup.net> | 2017-04-24 12:04:55 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-04-25 16:56:36 -0400 |
| commit | 10d96b990af1d680e31c291a15c7b66a6522de89 (patch) | |
| tree | 0a139bf866cd517f060e502ac29adf5c27f84225 /puppet/modules/tor/manifests/daemon/hidden_service.pp | |
| parent | f5d1850e7b3831b1ee6374627bb403aa3858a320 (diff) | |
git subrepo pull (merge) puppet/modules/tor
subrepo:
subdir: "puppet/modules/tor"
merged: "5ef29012"
upstream:
origin: "https://leap.se/git/puppet_tor"
branch: "master"
commit: "5ef29012"
git-subrepo:
version: "0.4.0"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "2e78d5d"
Diffstat (limited to 'puppet/modules/tor/manifests/daemon/hidden_service.pp')
| -rw-r--r-- | puppet/modules/tor/manifests/daemon/hidden_service.pp | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/puppet/modules/tor/manifests/daemon/hidden_service.pp b/puppet/modules/tor/manifests/daemon/hidden_service.pp index c8272116..07121bd6 100644 --- a/puppet/modules/tor/manifests/daemon/hidden_service.pp +++ b/puppet/modules/tor/manifests/daemon/hidden_service.pp @@ -1,17 +1,21 @@ # 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, content => template('tor/torrc.hidden_service.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 05, target => $tor::daemon::config_file, } } - |