From 2509c29d11b37681e7d0f1b4f68a31c986e53eef Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Sun, 8 Jan 2012 03:10:56 -0200
Subject: fixing relay options

---
 templates/torrc.erb | 90 ++++++++++++++++++++++++++---------------------------
 1 file changed, 45 insertions(+), 45 deletions(-)

(limited to 'templates/torrc.erb')

diff --git a/templates/torrc.erb b/templates/torrc.erb
index 3605ba6..2112931 100644
--- a/templates/torrc.erb
+++ b/templates/torrc.erb
@@ -2,91 +2,91 @@
 
 ## socks
 SocksPort <%= socks_port %>
-<%- for address in socks_listen_addresses %>
+<%- for address in socks_listen_addresses -%>
 SocksListenAddress <%= address %>
-<%- end %>
-<%- for policy in socks_policies %>
+<%- end -%>
+<%- for policy in socks_policies -%>
 SocksPolicy <%= policy %>
-<%- end %>
+<%- end -%>
 
 ## log
-<%- if log_rules != [] then %>
-<%-   for log_rule in log_rules %>
+<%- if log_rules != [] then -%>
+<%-   for log_rule in log_rules -%>
 Log <%= log_rule %>
-<%-   end %>
-<%- else %>
+<%-   end -%>
+<%- else -%>
 Log notice syslog
-<%- end %>
+<%- end -%>
 
 ## runtime
 RunAsDaemon 1
 DataDirectory <%= data_directory %>
 
 ## tor controller
-<%- if control_port != '' then %>
+<%- if control_port != 0 then -%>
 ControlPort <%= control_port %>
 HashedControlPassword <%= hashed_control_password %>
-<%- end %>
+<%- end -%>
 
 ## hidden services
-<%- for service in hidden_services %>
+<%- for service in hidden_services -%>
 HiddenServiceDir /var/tor/<%= service[:name] %>/<%= service[:dir] %>
-<%-   for port in service[:ports] %>
+<%-   for port in service[:ports] -%>
 HiddenServicePort <%= port %>
-<%-   end %>
-<%-  end %>
+<%-   end -%>
+<%-  end -%>
 
 ## relay
-<%- if or_port != 0 then %>
+<%- if or_port != 0 then -%>
 ORPort <%= or_port %>
-<%- end %>
-<%- if or_listen_address != '' then %>
+<%- end -%>
+<%- if or_listen_address != '' then -%>
 ORListenAddress <%= or_listen_address %>
-<%- end %>
-<%- if nickname != '' then %>
+<%- end -%>
+<%- if nickname != '' then -%>
 Nickname <%= nickname %>
-<%- end %>
-<%- if address != '' then %>
+<%- end -%>
+<%- if address != '' then -%>
 Address <%= address %>
-<%- end %>
-<%- if relay_bandwidth_rate != 0 then %>
+<%- end -%>
+<%- if relay_bandwidth_rate != '0' then -%>
 RelayBandwidthRate <%= relay_bandwidth_rate %> KB
-<%- end %>
-<%- if relay_bandwidth_burst != 0 then %>
+<%- end -%>
+<%- if relay_bandwidth_burst != '0' then -%>
 RelayBandwidthBurst <%= relay_bandwidth_burst %> KB
-<%- end %>
-<%- if accounting_max != 0 then %>
+<%- end -%>
+<%- if accounting_max != '0' then -%>
 AccountingMax <%= accounting_max %> GB
-<%- end %>
-<%- for accounting in accounting_start %>
+<%- end -%>
+<%- for accounting in accounting_start -%>
 AccountingStart <%= accounting_start %>
-<%- end %>
-<%- if contact_info != '' then %>
+<%- end -%>
+<%- if contact_info != '' then -%>
 ContactInfo <%= contact_info %>
-<%- end %>
+<%- end -%>
 
 ## directory listing
-<%- if dir_port != 0 then %>
+<%- if dir_port != '0' then -%>
 DirPort <%= dir_port %>
-<%- end %>
-<%- if dir_listen_address != '' then %>
+<%- end -%>
+<%- if dir_listen_address != '' then -%>
 DirListenAddress <%= dir_listen_address %>
-<%- end %>
-<%- if dir_port_front_page != '' then %>
+<%- end -%>
+<%- if dir_port_front_page != '' then -%>
 DirPortFrontPage <%= dir_port_front_page %>
-<%- end %>
+<%- end -%>
 
 ## relay family
-<%- if my_family != '' then %>
+<%- if my_family != '' then -%>
 MyFamily <%= my_family %>
-<%- end %>
+<%- end -%>
 
 ## bridge relay
-<%- if bridge_relay != 0 then %>
+<%- if bridge_relay != '0' then -%>
 BridgeRelay <%= bridge_relay %>
-<%- end %>
+<%- end -%>
 
 ## exit policies
-<%- for policy in exit_policies %>
+<%- for policy in exit_policies -%>
 ExitPolicy <%= policy %>
-<%- end %>
+<%- end -%>
-- 
cgit v1.2.3