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/relay.pp | |
parent | 1fef62f18dcbcf0f1995603b8f595f67ebf483d5 (diff) |
make it work with newer concat module
Diffstat (limited to 'manifests/daemon/relay.pp')
-rw-r--r-- | manifests/daemon/relay.pp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index 4fa303d..68e06ca 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, $listen_addresses = [], $outbound_bindaddresses = [], @@ -20,20 +21,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': - ensure => $ensure, - 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, + } } } |