diff options
author | mh <mh@immerda.ch> | 2017-08-30 18:30:12 +0200 |
---|---|---|
committer | mh <mh@immerda.ch> | 2017-08-30 18:30:12 +0200 |
commit | 1fcbe72115d57d53fced2777c8b54a4ee4ec17e9 (patch) | |
tree | 84f2a8c9c60de39b14b41f69ba6f4232b108d055 /manifests/daemon/control.pp | |
parent | 1fef62f18dcbcf0f1995603b8f595f67ebf483d5 (diff) |
make it work with newer concat module
Diffstat (limited to 'manifests/daemon/control.pp')
-rw-r--r-- | manifests/daemon/control.pp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp index 5e81c65..027a49d 100644 --- a/manifests/daemon/control.pp +++ b/manifests/daemon/control.pp @@ -1,24 +1,26 @@ # control definition define tor::daemon::control( + $ensure = 'present', $port = 0, $hashed_control_password = '', $cookie_authentication = 0, $cookie_auth_file = '', $cookie_auth_file_group_readable = '', - $ensure = present ) { +) { - if $cookie_authentication == '0' and $hashed_control_password == '' and $ensure != 'absent' { - fail('You need to define the tor control password') - } + if $ensure == 'present' { + if $cookie_authentication == '0' and $hashed_control_password == '' { + fail('You need to define the tor control password') + } - if $cookie_authentication == 0 and ($cookie_auth_file != '' or $cookie_auth_file_group_readable != '') { - notice('You set a tor cookie authentication option, but do not have cookie_authentication on') - } + if $cookie_authentication == 0 and ($cookie_auth_file != '' or $cookie_auth_file_group_readable != '') { + notice('You set a tor cookie authentication option, but do not have cookie_authentication on') + } - concat::fragment { '04.control': - ensure => $ensure, - content => template('tor/torrc.control.erb'), - order => '04', - target => $tor::daemon::config_file, + concat::fragment { '04.control': + content => template('tor/torrc.control.erb'), + order => '04', + target => $tor::daemon::config_file, + } } } |