diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 23:09:20 -0200 |
| commit | f252115be193d58d345b7d18228800c68a1e47aa (patch) | |
| tree | 31c95ada21d54314ecb1650f2b19e8540386dd62 /templates/torrc.control.erb | |
| parent | 89d3242cc7d4607f5eb8f1df39985c3597ee428d (diff) | |
| parent | a780e84001177f10a86a7bf824589c0553f513a0 (diff) | |
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
Conflicts:
manifests/daemon.pp
Diffstat (limited to 'templates/torrc.control.erb')
| -rw-r--r-- | templates/torrc.control.erb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/templates/torrc.control.erb b/templates/torrc.control.erb index df9513a..336c72d 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 -%> |