diff options
| author | duritong <peter.meier+github@immerda.ch> | 2014-06-13 08:59:00 +0200 |
|---|---|---|
| committer | duritong <peter.meier+github@immerda.ch> | 2014-06-13 08:59:00 +0200 |
| commit | fc56b10f32251472e21297ac1ac4f6146369f71f (patch) | |
| tree | 8777dee907bd235dd4aa22fc0a53218d993890ed | |
| parent | 2ad5ae93fe724f397bb6f1ca9761ccce2cd42f37 (diff) | |
| parent | d902d4dad59970669214176919b7759a02b1f7f4 (diff) | |
| download | puppet-tor-fc56b10f32251472e21297ac1ac4f6146369f71f.tar.gz puppet-tor-fc56b10f32251472e21297ac1ac4f6146369f71f.tar.bz2 | |
Merge pull request #13 from pataquets/add-safe-logging
Add safe_logging parameter.
| -rw-r--r-- | manifests/daemon.pp | 3 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 2440180..2522b2c 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -6,7 +6,8 @@ class tor::daemon ( $config_file = '/etc/tor/torrc', $use_bridges = 0, $automap_hosts_on_resolve = 0, - $log_rules = [ 'notice file /var/log/tor/notices.log' ] + $log_rules = [ 'notice file /var/log/tor/notices.log' ], + $safe_logging = 1, ) { class{'tor': diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index e0f6f7e..1cfe36f 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -12,6 +12,9 @@ Log <%= log_rule %> <%- else -%> Log notice syslog <%- end -%> +<%- if safe_logging != 1 then -%> +SafeLogging <%= safe_logging %> +<%- end -%> <%- if scope.lookupvar('tor::daemon::automap_hosts_on_resolve') != '0' then -%> AutomapHostsOnResolve <%= scope.lookupvar('tor::daemon::automap_hosts_on_resolve') %> |