aboutsummaryrefslogtreecommitdiff
path: root/templates/torrc.relay.erb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-07-30 22:08:30 -0400
committerMicah Anderson <micah@riseup.net>2012-07-30 22:08:53 -0400
commit0cc4d9c90911b0117cfd13fbee5e18bcfd9c89c3 (patch)
treeb28d7dea031a3cfb4fc3c1729eb81acec196f61d /templates/torrc.relay.erb
parent7bf57976706f73881d18bbaea0e7f87b7f1c3b40 (diff)
downloadpuppet-tor-0cc4d9c90911b0117cfd13fbee5e18bcfd9c89c3.tar.gz
puppet-tor-0cc4d9c90911b0117cfd13fbee5e18bcfd9c89c3.tar.bz2
switch bandwidth_rate and bandwidth_burst to be relay_bandwidth_rate and
relay_bandwidth_burst so we can use those variables for their proper tor configuration variables
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 2ab34bf..71c94b9 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