From b57819f650bc412f458a3b37620f557b5be7495a Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 12:45:59 -0400
Subject: add OutboundBindAddress, default set to $listen_address

---
 manifests/daemon.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/daemon.pp')

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 5f4e064..73014b3 100644
--- 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.
-- 
cgit v1.2.3


From efbcd9bbbe5fe95ab0500b79633d69f22fc63359 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Wed, 14 Mar 2012 13:05:14 -0400
Subject: add ExitPolicyRejectPrivate option to exit_policy define

---
 manifests/daemon.pp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'manifests/daemon.pp')

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 73014b3..173e565 100644
--- a/manifests/daemon.pp
+++ b/manifests/daemon.pp
@@ -174,6 +174,7 @@ class tor::daemon inherits tor {
   # exit policies
   define exit_policy( $accept = [],
                       $reject = [],
+                      $reject_private = 1,
                       $ensure = present ) {
 
     concatenated_file_part { "07.exit_policy.${name}":
-- 
cgit v1.2.3


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 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'manifests/daemon.pp')

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':
-- 
cgit v1.2.3