From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 25 Jan 2013 16:21:23 +0000 (-0200)
Subject: Fixing scope lookup at global template
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b9ee67f70b589a2d6bd174cf254e9042288d9ccd;p=puppet-tor.git

Fixing scope lookup at global template
---

diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index 3a3b623..f44eea5 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -3,13 +3,13 @@ RunAsDaemon 1
 DataDirectory <%= data_dir %>
 
 # log
-<%- if log_rules != [] then -%>
-<%-   for log_rule in log_rules -%>
+<%- if scope.lookupvar('tor::daemon::log_rules') != [] then -%>
+<%-   for scope.lookupvar('tor::daemon::log_rule') in log_rules -%>
 Log <%= log_rule %>
 <%-   end -%>
 <%- else -%>
 Log notice syslog
 <%- end -%>
 
-AutomapHostsOnResolve <%= automap_hosts_on_resolve%>
-UseBridges <%= use_bridges%>
+AutomapHostsOnResolve <%= scope.lookupvar('tor::daemon::automap_hosts_on_resolve') %>
+UseBridges <%= scope.lookupvar('tor::daemon::use_bridges') %>