From d902d4dad59970669214176919b7759a02b1f7f4 Mon Sep 17 00:00:00 2001
From: amontero-referup <amontero@referup.com>
Date: Thu, 20 Mar 2014 16:43:38 +0100
Subject: Add safe_logging parameter.

---
 manifests/daemon.pp        | 3 ++-
 templates/torrc.global.erb | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

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') %>
-- 
cgit v1.2.3