add ExitPolicyRejectPrivate option to exit_policy define

diff --git a/manifests/daemon.pp b/manifests/daemon.pp
index 73014b3f6da2458537d6ff44ddf1b48ed7636919..173e5650d8ed60c6ec20bdfe897e455b88d5b1ed 100644 (file)
--- 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}":

diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb
index 4732ad6bf054149b7906a9a254d5aedc7e61f8a2..92367c27d35bb1b307faf3d70523aaa460a5acd8 100644 (file)
--- a/templates/torrc.exit_policy.erb
+++ b/templates/torrc.exit_policy.erb
@@ -1,4 +1,7 @@
 # exit policies: <%= name %>
+<%- if reject_private != 1 then -%>
+ExitPolicyRejectPrivate <%= reject_private %>
+<%- end -%>
 <%- for policy in accept -%>
 ExitPolicy accept <%= policy %>
 <%- end -%>