From a19e1cacb1d52287c35e96fdb37ad3a0ab8c0dd1 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 15:29:35 -0400
Subject: outbound_bindaddress should be outbound_bindaddresses and
 $outbound_bindaddresses  = $listen_addresses

---
 manifests/daemon.pp       | 24 ++++++++++++------------
 templates/torrc.relay.erb |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 173e565..6d8c315 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -98,18 +98,18 @@ class tor::daemon inherits tor {
   }
 
   # relay definition
-  define relay( $port                  = 0,
-                $listen_addresses      = [],
-                $outbound_bindaddress  = $listen_address,
-                $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          = '',
-                $my_family             = '', # TODO: autofill with other relays
-                $address               = "tor.${domain}",
-                $bridge_relay          = 0,
-                $ensure                = present ) {
+  define relay( $port                    = 0,
+                $listen_addresses        = [],
+                $outbound_bindaddresses  = $listen_addresses,
+                $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            = '',
+                $my_family               = '', # TODO: autofill with other relays
+                $address                 = "tor.${domain}",
+                $bridge_relay            = 0,
+                $ensure                  = present ) {
     $nickname = $name
 
     concatenated_file_part { '03.relay':
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 72625d4..1b2e082 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -4,8 +4,8 @@ ORPort <%= port %>
 <%-   for listen_address in listen_addresses -%>
 ORListenAddress <%= listen_address %>
 <%-   end -%>
-<%-   for outbound_bindaddress in outbound_bindaddress -%>
-OutboundBindAddress <%= outbound_bindaddress %>
+<%-   for outbound_bindaddresses in outbound_bindaddresses -%>
+OutboundBindAddress <%= outbound_bindaddresses %>
 <%-   end -%>
 <%-   if nickname != '' then -%>
 Nickname <%= nickname %>
-- 
cgit v1.2.3