diff options
| -rw-r--r-- | manifests/daemon.pp | 4 | ||||
| -rw-r--r-- | templates/torrc.relay.erb | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index c522e9f..6ac6dec 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -96,8 +96,8 @@ class tor::daemon inherits tor { # relay definition define relay( $port = 0, $listen_addresses = [], - $relay_bandwidth_rate = 0, # KB/s, 0 for no limit. - $relay_bandwidth_burst = 0, # KB/s, 0 for no limit. + $bandwidth_rate = 0, # KB/s, 0 for no limit. + $bandwidth_burst = 0, # KB/s, 0 for no limit. $accounting_max = 0, # GB, 0 for no limit. $accounting_start = [], $contact_info = '', diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 95496d6..2aee354 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -11,11 +11,11 @@ Nickname <%= nickname %> <%- if address != '' then -%> Address <%= address %> <%- end -%> -<%- if relay_bandwidth_rate != '0' then -%> -RelayBandwidthRate <%= relay_bandwidth_rate %> KB +<%- if bandwidth_rate != '0' then -%> +RelayBandwidthRate <%= bandwidth_rate %> KB <%- end -%> -<%- if relay_bandwidth_burst != '0' then -%> -RelayBandwidthBurst <%= relay_bandwidth_burst %> KB +<%- if bandwidth_burst != '0' then -%> +RelayBandwidthBurst <%= bandwidth_burst %> KB <%- end -%> <%- if accounting_max != '0' then -%> AccountingMax <%= accounting_max %> GB |