diff options
| author | mh <mh@immerda.ch> | 2017-08-30 00:18:32 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2017-08-30 00:18:32 +0200 |
| commit | 1fef62f18dcbcf0f1995603b8f595f67ebf483d5 (patch) | |
| tree | 5351643676b605d3c9fb90e9cc3d6293adacec1b | |
| parent | 4ac020202d87afcd69de483a777eff03cef75a4c (diff) | |
cleanup template mess that produces invalid template
| -rw-r--r-- | templates/torrc.global.erb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index f577673..9cf7816 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,24 +1,24 @@ # runtime RunAsDaemon 1 -<% if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%> +<% if (v=scope['tor::daemon::data_dir']) != '/var/lib/tor' -%> DataDirectory <%= v %> <% end -%> # log -<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%> +<% if (rules=scope['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 -%> +<% end +end -%> +<% if (v=scope['tor::daemon::safe_logging']) != 1 -%> +SafeLogging <%= v %> +<% end -%> -<% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> +<% if (v=scope['tor::daemon::automap_hosts_on_resolve']) != 0 -%> AutomapHostsOnResolve <%= v %> -<% end -%> -<% if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%> +<% end -%> +<% if (v=scope['tor::daemon::use_bridges']) != 0 -%> UseBridges <%= v %> -<%- end -%> +<% end -%> |