diff options
| author | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2012-03-14 20:36:22 +0100 |
| commit | 7bf57976706f73881d18bbaea0e7f87b7f1c3b40 (patch) | |
| tree | 38af3a1f768f4b6501d0fb91d3f788ce92fb1a9a /templates | |
| parent | 510e81d04bdfa15dadb272431fbe78d320d3fc68 (diff) | |
| parent | e1d9f793aa356982b017ed197e19f4cdbb84cb83 (diff) | |
| download | puppet-tor-7bf57976706f73881d18bbaea0e7f87b7f1c3b40.tar.gz puppet-tor-7bf57976706f73881d18bbaea0e7f87b7f1c3b40.tar.bz2 | |
Merge remote-tracking branch 'riseup/master'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/torrc.exit_policy.erb | 3 | ||||
| -rw-r--r-- | templates/torrc.relay.erb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb index 4732ad6..92367c2 100644 --- 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 -%> diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 4754859..2ab34bf 100644 --- 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_bindaddresses -%> +OutboundBindAddress <%= outbound_bindaddress %> +<%- end -%> <%- if nickname != '' then -%> Nickname <%= nickname %> <%- end -%> |