summaryrefslogtreecommitdiff
path: root/templates/torrc.relay.erb
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-08-04 16:49:53 +0200
committerintrigeri <intrigeri@boum.org>2012-08-04 16:49:53 +0200
commit817a37f02ec443603cbfe7e2cc5c55e07a2a471c (patch)
tree0a4fc1506a864ec498ed7024722c5d193c755558 /templates/torrc.relay.erb
parentd017a7eee415a1398a0f7e533a5bfba3986e7505 (diff)
parent43f26a0ff6e7e882ed241a26c99f09d669524440 (diff)
Merge remote-tracking branch 'shared/master'
Conflicts: manifests/daemon.pp
Diffstat (limited to 'templates/torrc.relay.erb')
-rw-r--r--templates/torrc.relay.erb14
1 files changed, 10 insertions, 4 deletions
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 990dfcc..85320d3 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -13,11 +13,17 @@ Nickname <%= nickname %>
<%- if address != '' then -%>
Address <%= address %>
<%- end -%>
-<%- if bandwidth_rate != '0' then -%>
-RelayBandwidthRate <%= bandwidth_rate %> KB
+<%- if bandwidth_rate != '' then -%>
+BandwidthRate <%= bandwidth_rate %> KB
<%- end -%>
-<%- if bandwidth_burst != '0' then -%>
-RelayBandwidthBurst <%= bandwidth_burst %> KB
+<%- if bandwidth_burst != '' then -%>
+BandwidthBurst <%= bandwidth_burst %> KB
+<%- end -%>
+<%- if relay_bandwidth_rate != '0' then -%>
+RelayBandwidthRate <%= relay_bandwidth_rate %> KB
+<%- end -%>
+<%- if relay_bandwidth_burst != '0' then -%>
+RelayBandwidthBurst <%= relay_bandwidth_burst %> KB
<%- end -%>
<%- if accounting_max != '0' then -%>
AccountingMax <%= accounting_max %> GB