fixing parameter name

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index c522e9f0f99cf04973a49fedd5cc8958b529fc56..6ac6dec8cebaaf4c2a339451ac135a33c4468010 100644 (file)
--- 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 95496d687a789ac7cf5ad836bce81f5071c37560..2aee3545cdb69055d6773face44f4ceae9a5608f 100644 (file)
--- 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