diff options
| author | mh <mh@immerda.ch> | 2014-06-13 09:41:34 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-06-13 09:41:34 +0200 |
| commit | 1d4203344763ef9870e92a4b47ceab2dede83550 (patch) | |
| tree | aa8f24f21bcfb9a78c9218afa9427d48171ef206 | |
| parent | a9b391b774eae6d1272368f00e96cab022648326 (diff) | |
| parent | fc56b10f32251472e21297ac1ac4f6146369f71f (diff) | |
| download | puppet-tor-1d4203344763ef9870e92a4b47ceab2dede83550.tar.gz puppet-tor-1d4203344763ef9870e92a4b47ceab2dede83550.tar.bz2 | |
Merge remote-tracking branch 'github/master'
Conflicts:
templates/torrc.global.erb
| -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 c320bfa..fc8c11e 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -12,6 +12,9 @@ Log notice syslog Log <%= log_rule %> <% end -%> <% end -%> +<%- if safe_logging != 1 then -%> +SafeLogging <%= safe_logging %> +<%- end -%> <% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> AutomapHostsOnResolve <%= v %> |