diff options
author | kwadronaut <kwadronaut@leap.se> | 2018-11-07 15:43:05 +0100 |
---|---|---|
committer | kwadronaut <kwadronaut@leap.se> | 2018-11-07 15:43:05 +0100 |
commit | d30831f7214da266ad943cf4013f0632e8b15d48 (patch) | |
tree | e04489f4d3755c91c637ac413596c172300c3aad /manifests/daemon/relay.pp | |
parent | 4380e2eabd94d8f0df7f63c642dd46ec4783ef07 (diff) | |
parent | b1af45d47d3e1441405a9b4b67f44f7d6008486a (diff) |
Merge remote-tracking branch 'riseup/master'
Diffstat (limited to 'manifests/daemon/relay.pp')
-rw-r--r-- | manifests/daemon/relay.pp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index 555587c..fa908f5 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -1,7 +1,6 @@ # relay definition define tor::daemon::relay( $port = 0, - $listen_addresses = [], $outbound_bindaddresses = [], $portforwarding = 0, # KB/s, defaulting to using tor's default: 5120KB/s @@ -14,7 +13,7 @@ define tor::daemon::relay( $relay_bandwidth_burst = 0, # GB, 0 for no limit $accounting_max = 0, - $accounting_start = [], + $accounting_start = "month 1 0:00", $contact_info = '', # TODO: autofill with other relays $my_family = '', @@ -31,7 +30,6 @@ define tor::daemon::relay( } concat::fragment { '03.relay': - ensure => $ensure, content => template('tor/torrc.relay.erb'), order => 03, target => $tor::daemon::config_file, |