From 1591ee0c75565a0109ce4615f78e2bef444e1491 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 3 Aug 2012 15:00:32 -0400 Subject: add $cookie_authentication, $cookie_auth_file and $cookie_auth_file_group_readable variables --- templates/torrc.control.erb | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'templates/torrc.control.erb') diff --git a/templates/torrc.control.erb b/templates/torrc.control.erb index df9513a..7e10d4d 100644 --- a/templates/torrc.control.erb +++ b/templates/torrc.control.erb @@ -1,6 +1,16 @@ # tor controller <%- if port != '0' then -%> ControlPort <%= port %> +<%- if cookie_authentication != '0' then -%> +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 -%> -- cgit v1.2.3 From d7ec8bf77c55f573138d41d5e24e1fb80e073b25 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Fri, 3 Aug 2012 15:08:43 -0400 Subject: fix template syntax error --- templates/torrc.control.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/torrc.control.erb') diff --git a/templates/torrc.control.erb b/templates/torrc.control.erb index 7e10d4d..336c72d 100644 --- a/templates/torrc.control.erb +++ b/templates/torrc.control.erb @@ -9,7 +9,7 @@ CookieAuthFile <%= cookie_auth_file %> <%- if cookie_auth_file_group_readable != '' then -%> CookieAuthFileGroupReadable <%= cookie_auth_file_group_readable %> <%- end -%> -<%- else %-> +<%- else -%> HashedControlPassword <%= hashed_control_password %> <%- end -%> <%- end -%> -- cgit v1.2.3