diff options
| author | LeLutin <gabster@lelutin.ca> | 2016-11-03 19:38:56 +0000 |
|---|---|---|
| committer | LeLutin <gabster@lelutin.ca> | 2016-11-03 19:38:56 +0000 |
| commit | 6e60d2c772be435fe375778523dec05239a43d0d (patch) | |
| tree | 60157c0134ddd34e1b8f8d88504ce39089467cf6 | |
| parent | 23f6b3f4fd0ed128a22014a3783244a4107f490a (diff) | |
| parent | bd6b6a2e6c0d3a09127d8b6a342195d6f924de44 (diff) | |
Merge branch 'bugfix/honor_safe_logging' into 'master'
Update template to really honor tor::daemon's safe_logging parameter.
Without this change, using tor::daemon with the default safe_logging
parameter results in a "SafeLogging 1" line being added to torrc,
which is obviously not the intent of this piece of code.
Also, this change makes parameters lookup consistent with how it's done
everywhere else in this ERB template.
See merge request !7
| -rw-r--r-- | templates/torrc.global.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index f577673..a02afc8 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -12,8 +12,8 @@ Log notice syslog Log <%= log_rule %> <% end -%> <% end -%> -<%- if @safe_logging != 1 then -%> -SafeLogging <%= @safe_logging %> +<%- if (v=scope.lookupvar('tor::daemon::safe_logging')) != '1' then -%> +SafeLogging <%= v %> <%- end -%> <% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> |