diff options
| author | mh <mh@immerda.ch> | 2014-04-18 11:10:16 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 11:10:16 +0200 |
| commit | 5228a3d6bd2fce2e56bea538bd9c29641cf22474 (patch) | |
| tree | 892e962bbd36915248545bf122810b4c2aa936fe /templates/torrc.global.erb | |
| parent | 0a7fa2d5ec783a0c72dc2484c0e5958ec281db1f (diff) | |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/torrc.global.erb')
| -rw-r--r-- | templates/torrc.global.erb | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index e0f6f7e..c320bfa 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,21 +1,21 @@ # 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 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 -%> |