summaryrefslogtreecommitdiff
path: root/manifests/daemon/relay.pp
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
committerkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
commite598088c2f9263e7682e399b65376d7a2c529ded (patch)
treeaa628edf0ad55dc2adea8bc6f96bf516aaba0a30 /manifests/daemon/relay.pp
parentd30831f7214da266ad943cf4013f0632e8b15d48 (diff)
parent77070c6bf97ecd6fc860cae6120dca86fa910e5a (diff)
Merge remote-tracking branch 'shared/master'HEADmaster
Diffstat (limited to 'manifests/daemon/relay.pp')
-rw-r--r--manifests/daemon/relay.pp27
1 files changed, 15 insertions, 12 deletions
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp
index fa908f5..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,
@@ -13,25 +14,27 @@ define tor::daemon::relay(
$relay_bandwidth_burst = 0,
# GB, 0 for no limit
$accounting_max = 0,
- $accounting_start = "month 1 0:00",
+ $accounting_start = 'month 1 0:00',
$contact_info = '',
# TODO: autofill with other relays
$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,
+ }
}
}