From 5228a3d6bd2fce2e56bea538bd9c29641cf22474 Mon Sep 17 00:00:00 2001 From: mh Date: Fri, 18 Apr 2014 11:10:16 +0200 Subject: address puppet 3.x deprecation warnings --- templates/torrc.control.erb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'templates/torrc.control.erb') 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 -%> -- cgit v1.2.3