aboutsummaryrefslogtreecommitdiff
path: root/templates/torrc.control.erb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-08-03 15:00:32 -0400
committerMicah Anderson <micah@riseup.net>2012-08-03 15:00:32 -0400
commit1591ee0c75565a0109ce4615f78e2bef444e1491 (patch)
tree98500ffd28115b988af442eab5ddcbef0bfce384 /templates/torrc.control.erb
parent5a1f664b66f62d2f75fb8ea8cee730aaf9097e84 (diff)
downloadpuppet-tor-1591ee0c75565a0109ce4615f78e2bef444e1491.tar.gz
puppet-tor-1591ee0c75565a0109ce4615f78e2bef444e1491.tar.bz2
add $cookie_authentication, $cookie_auth_file and $cookie_auth_file_group_readable variables
Diffstat (limited to 'templates/torrc.control.erb')
-rw-r--r--templates/torrc.control.erb10
1 files changed, 10 insertions, 0 deletions
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 -%>