]> gitweb.fluxo.info Git - puppet-tor.git/commitdiff
Fixing scope lookup at global template
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Jan 2013 16:21:23 +0000 (14:21 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Jan 2013 16:21:23 +0000 (14:21 -0200)
templates/torrc.global.erb

index 3a3b623426d01cabe60d2ae47aa489e543ef42ef..f44eea5f37162f5574a5e91c6d36d3ec2dc883fd 100644 (file)
@@ -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') %>