From: mh <mh@immerda.ch>
Date: Fri, 13 Jun 2014 07:41:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'github/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1d4203344763ef9870e92a4b47ceab2dede83550;p=puppet-tor.git

Merge remote-tracking branch 'github/master'

Conflicts:
	templates/torrc.global.erb
---

1d4203344763ef9870e92a4b47ceab2dede83550
diff --cc templates/torrc.global.erb
index c320bfa,1cfe36f..fc8c11e
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@@ -1,21 -1,24 +1,24 @@@
  # runtime
  RunAsDaemon 1
 -<%- if scope.lookupvar('tor::daemon::data_dir') != '/var/lib/tor' then -%>
 -DataDirectory <%= scope.lookupvar('tor::daemon::data_dir') %>
 -<%- end -%>
 +<%  if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%>
 +DataDirectory <%= v %>
 +<% end -%>
  
  # log
 -<%- if scope.lookupvar('tor::daemon::log_rules') != [] then -%>
 -<%-   for log_rule in scope.lookupvar('tor::daemon::log_rules') -%>
 -Log <%= log_rule %>
 -<%-   end -%>
 -<%- else -%>
 +<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%>
  Log notice syslog
 -<%- end -%>
 +<%  else -%>
 +<%   rules.each do |log_rule| -%>
 +Log <%= log_rule %>
 +<%    end -%>
 +<%  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') %>
 -<%- end -%>
 -<%- if scope.lookupvar('tor::daemon::use_bridges') != '0' then -%>
 -UseBridges <%= scope.lookupvar('tor::daemon::use_bridges') %>
 +<%  if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%>
 +AutomapHostsOnResolve <%= v %>
 +<%  end -%>
 +<%  if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%>
 +UseBridges <%= v %>
  <%- end -%>