diff options
| author | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
|---|---|---|
| committer | Micah <micah@riseup.net> | 2015-03-27 18:50:01 +0000 |
| commit | 3925f36f7cd0f15029304363b0f5749750627c96 (patch) | |
| tree | 5613a76af8c008a5820e41c097ed94f231412956 /templates/torrc.control.erb | |
| parent | a31579095231c68a2786955b9149d3bcd13400af (diff) | |
| parent | 19a44ce97f59633002d844e2b37f2b26b2f1cfbc (diff) | |
Merge branch 'improvements' into 'master'
Improvements
These are a bunch of improvements I got on my github profile in the past.
Interested in merging them?
Summary:
* adds tor repo management
* removes a workaround for a fixed bug
* adds tor-arm support
* support for safe logging
* puppet 3 ready templates.
It's merged on top of the current master.
See merge request !1
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 -%> |