summaryrefslogtreecommitdiff
path: root/templates/torrc.global.erb
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
committerkwadronaut <kwadronaut@leap.se>2018-11-07 15:43:41 +0100
commite598088c2f9263e7682e399b65376d7a2c529ded (patch)
treeaa628edf0ad55dc2adea8bc6f96bf516aaba0a30 /templates/torrc.global.erb
parentd30831f7214da266ad943cf4013f0632e8b15d48 (diff)
parent77070c6bf97ecd6fc860cae6120dca86fa910e5a (diff)
Merge remote-tracking branch 'shared/master'HEADmaster
Diffstat (limited to 'templates/torrc.global.erb')
-rw-r--r--templates/torrc.global.erb20
1 files changed, 10 insertions, 10 deletions
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index c29b76b..763e63f 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -1,24 +1,24 @@
# runtime
RunAsDaemon 1
-<% if (v=scope.lookupvar('tor::daemon::data_dir')) != '/var/lib/tor' -%>
+<% if (v=scope['tor::daemon::data_dir']) != '/var/lib/tor' -%>
DataDirectory <%= v %>
<% end -%>
# log
-<% if (rules=scope.lookupvar('tor::daemon::log_rules')).empty? -%>
+<% if (rules=scope['tor::daemon::log_rules']).empty? -%>
Log notice syslog
<% else -%>
<% Array(rules).each do |log_rule| -%>
Log <%= log_rule %>
-<% end -%>
-<% end -%>
-<%- if (v=scope.lookupvar('tor::daemon::safe_logging')) != '1' then -%>
+<% end
+end -%>
+<% if (v=scope['tor::daemon::safe_logging']) != 1 -%>
SafeLogging <%= v %>
-<%- end -%>
+<% end -%>
-<% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%>
+<% if (v=scope['tor::daemon::automap_hosts_on_resolve']) != 0 -%>
AutomapHostsOnResolve <%= v %>
-<% end -%>
-<% if (v=scope.lookupvar('tor::daemon::use_bridges')) != '0' -%>
+<% end -%>
+<% if (v=scope['tor::daemon::use_bridges']) != 0 -%>
UseBridges <%= v %>
-<%- end -%>
+<% end -%>