diff options
| author | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
| commit | 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1 (patch) | |
| tree | 1beb63d346b919727a0e7e8df124feb5039930cb /templates/torrc.global.erb | |
| parent | 43506968b1760b8a54f012c72baa9a5820cee21a (diff) | |
| parent | fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (diff) | |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/tor
Diffstat (limited to 'templates/torrc.global.erb')
| -rw-r--r-- | templates/torrc.global.erb | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index 3a3b623..f577673 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,15 +1,24 @@ # runtime RunAsDaemon 1 -DataDirectory <%= data_dir %> +<% if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%> +DataDirectory <%= v %> +<% end -%> # log -<%- if log_rules != [] then -%> -<%- for log_rule in log_rules -%> +<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%> +Log notice syslog +<% else -%> +<% rules.each do |log_rule| -%> Log <%= log_rule %> +<% end -%> +<% end -%> +<%- if @safe_logging != 1 then -%> +SafeLogging <%= @safe_logging %> <%- end -%> -<%- else -%> -Log notice syslog -<%- end -%> -AutomapHostsOnResolve <%= automap_hosts_on_resolve%> -UseBridges <%= use_bridges%> +<% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> +AutomapHostsOnResolve <%= v %> +<% end -%> +<% if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%> +UseBridges <%= v %> +<%- end -%> |