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.control.erb | |
parent | 0a7fa2d5ec783a0c72dc2484c0e5958ec281db1f (diff) |
address puppet 3.x deprecation warnings
Diffstat (limited to 'templates/torrc.control.erb')
-rw-r--r-- | templates/torrc.control.erb | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/templates/torrc.control.erb b/templates/torrc.control.erb index 336c72d..0b68faf 100644 --- a/templates/torrc.control.erb +++ b/templates/torrc.control.erb @@ -1,16 +1,16 @@ # tor controller -<%- if port != '0' then -%> -ControlPort <%= port %> -<%- if cookie_authentication != '0' then -%> +<% if @port != '0' -%> +ControlPort <%= @port %> +<% if @cookie_authentication != '0' -%> CookieAuthentication 1 -<%- if cookie_auth_file != '' then -%> -CookieAuthFile <%= cookie_auth_file %> -<%- end -%> -<%- if cookie_auth_file_group_readable != '' then -%> -CookieAuthFileGroupReadable <%= cookie_auth_file_group_readable %> -<%- end -%> -<%- else -%> -HashedControlPassword <%= hashed_control_password %> -<%- end -%> -<%- end -%> +<% if @cookie_auth_file != '' -%> +CookieAuthFile <%= @cookie_auth_file %> +<% end -%> +<% if @cookie_auth_file_group_readable != '' -%> +CookieAuthFileGroupReadable <%= @cookie_auth_file_group_readable %> +<% end -%> +<% else -%> +HashedControlPassword <%= @hashed_control_password %> +<% end -%> +<% end -%> |