diff options
| author | Micah Anderson <micah@riseup.net> | 2017-01-23 12:51:35 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2017-01-23 12:51:35 -0500 |
| commit | 6b723aec332a7034b80312431d5d7f55dc513136 (patch) | |
| tree | afe07983b73618518065e51b0864d2db5a0c3dc9 /templates | |
| parent | 46ceed3ff73a9f33264eef179b0e2a9cf92ad151 (diff) | |
| parent | 6e60d2c772be435fe375778523dec05239a43d0d (diff) | |
Merge remote-tracking branch 'origin' into riseup
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/torrc.directory.erb | 4 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 4 | ||||
| -rw-r--r-- | templates/torrc.relay.erb | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/templates/torrc.directory.erb b/templates/torrc.directory.erb index 1af9f40..c7dc4ab 100644 --- a/templates/torrc.directory.erb +++ b/templates/torrc.directory.erb @@ -1,11 +1,11 @@ # directory listing -<% if port != '0' -%> +<% if @port != '0' -%> DirPort <%= @port %> <% end -%> <% listen_addresses.each do |listen_address| -%> DirListenAddress <%= listen_address %> <% end -%> <% if @port_front_page != '' -%> -DirPortFrontPage <%= port_front_page %> +DirPortFrontPage <%= @port_front_page %> <%- end -%> diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index f577673..a02afc8 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -12,8 +12,8 @@ Log notice syslog Log <%= log_rule %> <% end -%> <% end -%> -<%- if @safe_logging != 1 then -%> -SafeLogging <%= @safe_logging %> +<%- if (v=scope.lookupvar('tor::daemon::safe_logging')) != '1' then -%> +SafeLogging <%= v %> <%- end -%> <% if (v=scope.lookupvar('tor::daemon::automap_hosts_on_resolve')) != '0' -%> diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb index 511bda1..a286459 100644 --- a/templates/torrc.relay.erb +++ b/templates/torrc.relay.erb @@ -1,11 +1,11 @@ # relay <% if @port != 0 -%> ORPort <%= @port %> -<% listen_addresses.each do |listen_address| -%> -ORListenAddress <%= listen_address %> +<% @listen_addresses.each do |listen_address| -%> +ORListenAddress <%= @listen_address %> <% end -%> -<% real_outbound_bindaddresses.each do |outbound_bindaddress| -%> -OutboundBindAddress <%= outbound_bindaddress %> +<% @real_outbound_bindaddresses.each do |outbound_bindaddress| -%> +OutboundBindAddress <%= @outbound_bindaddress %> <% end -%> <% if @nickname != '' -%> Nickname <%= @nickname %> |