From 8528e6d02444c39497e7aa88006661dd1adc9584 Mon Sep 17 00:00:00 2001 From: amontero Date: Tue, 2 Jul 2013 02:17:29 +0200 Subject: Don't add config entries to torrc if value is default. ( duritong/puppet-tor#5 ) --- templates/torrc.global.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index 0bc3bf2..e0f6f7e 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,6 +1,8 @@ # runtime RunAsDaemon 1 +<%- if scope.lookupvar('tor::daemon::data_dir') != '/var/lib/tor' then -%> DataDirectory <%= scope.lookupvar('tor::daemon::data_dir') %> +<%- end -%> # log <%- if scope.lookupvar('tor::daemon::log_rules') != [] then -%> @@ -11,5 +13,9 @@ Log <%= log_rule %> Log notice syslog <%- end -%> +<%- if scope.lookupvar('tor::daemon::automap_hosts_on_resolve') != '0' then -%> AutomapHostsOnResolve <%= scope.lookupvar('tor::daemon::automap_hosts_on_resolve') %> +<%- end -%> +<%- if scope.lookupvar('tor::daemon::use_bridges') != '0' then -%> UseBridges <%= scope.lookupvar('tor::daemon::use_bridges') %> +<%- end -%> -- cgit v1.2.3 From 4f13ce12a5ed92b082d883e7a30eef1cd4a0500d Mon Sep 17 00:00:00 2001 From: amontero Date: Mon, 15 Jul 2013 20:13:24 +0200 Subject: Fix ExitPolicyRejectPrivate not being omitted if set to 1. ( duritong/puppet-tor#5 ) --- templates/torrc.exit_policy.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb index 92367c2..65f9d09 100644 --- a/templates/torrc.exit_policy.erb +++ b/templates/torrc.exit_policy.erb @@ -1,5 +1,5 @@ # exit policies: <%= name %> -<%- if reject_private != 1 then -%> +<%- if reject_private != '1' then -%> ExitPolicyRejectPrivate <%= reject_private %> <%- end -%> <%- for policy in accept -%> -- cgit v1.2.3