diff options
author | Louis-Philippe VĂ©ronneau <pollito@riseup.net> | 2018-03-06 17:29:54 +0000 |
---|---|---|
committer | Louis-Philippe VĂ©ronneau <pollito@riseup.net> | 2018-03-06 17:29:54 +0000 |
commit | 7c40929d8a2a9438ccd883e9d856d526b852da8c (patch) | |
tree | d8529a383482db6cd716c16074e6b798c1069e7b /manifests/daemon/relay.pp | |
parent | 228ae4a53999dbc49fa7c4d2883468dde10f19fb (diff) | |
parent | 6ebebe3ab04e8ba3d4b651e49012646046642160 (diff) |
Merge branch 'immerda-merge' into 'master'
Immerda merge
Closes #2
See merge request shared-puppet-modules-group/tor!19
Diffstat (limited to 'manifests/daemon/relay.pp')
-rw-r--r-- | manifests/daemon/relay.pp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index 9ba2323..bc72dd0 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -1,5 +1,6 @@ # relay definition define tor::daemon::relay( + $ensure = 'present', $port = 0, $outbound_bindaddresses = [], $portforwarding = 0, @@ -19,19 +20,21 @@ define tor::daemon::relay( $my_family = '', $address = "tor.${::domain}", $bridge_relay = 0, - $ensure = present ) { +) { - $nickname = $name + if $ensure == 'present' { + $nickname = $name - if $outbound_bindaddresses == [] { - $real_outbound_bindaddresses = [] - } else { - $real_outbound_bindaddresses = $outbound_bindaddresses - } + if $outbound_bindaddresses == [] { + $real_outbound_bindaddresses = [] + } else { + $real_outbound_bindaddresses = $outbound_bindaddresses + } - concat::fragment { '03.relay': - content => template('tor/torrc.relay.erb'), - order => 03, - target => $tor::daemon::config_file, + concat::fragment { '03.relay': + content => template('tor/torrc.relay.erb'), + order => '03', + target => $tor::daemon::config_file, + } } } |