diff options
| author | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
| commit | 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1 (patch) | |
| tree | 1beb63d346b919727a0e7e8df124feb5039930cb /templates/torrc.control.erb | |
| parent | 43506968b1760b8a54f012c72baa9a5820cee21a (diff) | |
| parent | fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (diff) | |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/tor
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 -%> |