add OutboundBindAddress, default set to $listen_address

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 5f4e06491ca65c43c5eb23b6e8298adac6f19e02..73014b3f6da2458537d6ff44ddf1b48ed7636919 100644 (file)
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -100,6 +100,7 @@ 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.

diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 47548591c542b1cf48eb9f80844d246512432317..72625d4a28ef52205fe61c605e396d6696959408 100644 (file)
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -4,6 +4,9 @@ ORPort <%= port %>
 <%-   for listen_address in listen_addresses -%>
 ORListenAddress <%= listen_address %>
 <%-   end -%>
+<%-   for outbound_bindaddress in outbound_bindaddress -%>
+OutboundBindAddress <%= outbound_bindaddress %>
+<%-   end -%>
 <%-   if nickname != '' then -%>
 Nickname <%= nickname %>
 <%-   end -%>