Add PortForwarding to allow UPnP firewall pf configuration.

diff --git a/README b/README
index d52a2b317e1cdfd3a951b0c7ea409cf6d75a6251..7777438a7666f48e0d9bcaf9f3a97cc4b6876c42 100644 (file)
--- a/README
+++ b/README
@@ -133,6 +133,8 @@ You have the following options that can be passed to a relay, with the defaults
  
 $port                    = 0,
 $listen_addresses        = [],
+$portforwarding          = 0,     # PortForwarding 0|1, set for opening ports at the router via UPnP.
+                                  # Requires 'tor-fw-helper' binary present.
 $bandwidth_rate          = '',    # KB/s, defaulting to using tor's default: 5120KB/s
 $bandwidth_burst         = '',    # KB/s, defaulting to using tor's default: 10240KB/s
 $relay_bandwidth_rate    = 0,     # KB/s, 0 for no limit.

diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp
index d92a8b93631ae94946e603f8a931d813776a1f05..3ef86023c9138bf242a07dd40eec1240c570c385 100644 (file)
--- a/manifests/daemon/relay.pp
+++ b/manifests/daemon/relay.pp
@@ -3,6 +3,7 @@ define tor::daemon::relay(
   $port                    = 0,
   $listen_addresses        = [],
   $outbound_bindaddresses  = [],
+  $portforwarding          = 0,
   # KB/s, defaulting to using tor's default: 5120KB/s
   $bandwidth_rate          = '',
   # KB/s, defaulting to using tor's default: 10240KB/s

diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 85320d38514830fb258a03383e49801208b6b678..74a7c61cd9d05d4a5e2bcfea2782ea1d050a2a33 100644 (file)
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -13,6 +13,9 @@ Nickname <%= nickname %>
 <%-   if address != '' then -%>
 Address <%= address %>
 <%-   end -%>
+<%-   if portforwarding != '0' then -%>
+PortForwarding <%= portforwarding %>
+<%-   end -%>
 <%-   if bandwidth_rate != '' then -%>
 BandwidthRate <%= bandwidth_rate %> KB
 <%-   end -%>
@@ -41,4 +44,3 @@ MyFamily <%= my_family %>
 <%- if bridge_relay != '0' then -%>
 BridgeRelay <%= bridge_relay %>
 <%- end -%>
-