summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2012-01-11 19:18:04 -0200
committerdrebs <drebs@riseup.net>2012-01-11 19:18:04 -0200
commit508c9cf3445429f4c9536b950b7922cbb8507e5f (patch)
tree5664d8e83266a139955486cca7445bf85c8948cc
parente2e22ff5475c4033cccdc21b0c941a9218834802 (diff)
removing blank lines in templates
-rw-r--r--templates/torrc.control.erb1
-rw-r--r--templates/torrc.directory.erb1
-rw-r--r--templates/torrc.exit_policy.erb1
-rw-r--r--templates/torrc.global.erb2
-rw-r--r--templates/torrc.hidden_service.erb1
-rw-r--r--templates/torrc.relay.erb1
-rw-r--r--templates/torrc.socks.erb1
7 files changed, 0 insertions, 8 deletions
diff --git a/templates/torrc.control.erb b/templates/torrc.control.erb
index 6808d5e..df9513a 100644
--- a/templates/torrc.control.erb
+++ b/templates/torrc.control.erb
@@ -1,5 +1,4 @@
# tor controller
-
<%- if port != '0' then -%>
ControlPort <%= port %>
HashedControlPassword <%= hashed_control_password %>
diff --git a/templates/torrc.directory.erb b/templates/torrc.directory.erb
index 14712ef..c6b35b5 100644
--- a/templates/torrc.directory.erb
+++ b/templates/torrc.directory.erb
@@ -1,5 +1,4 @@
# directory listing
-
<%- if port != '0' then -%>
DirPort <%= port %>
<%- end -%>
diff --git a/templates/torrc.exit_policy.erb b/templates/torrc.exit_policy.erb
index e240013..4732ad6 100644
--- a/templates/torrc.exit_policy.erb
+++ b/templates/torrc.exit_policy.erb
@@ -1,5 +1,4 @@
# exit policies: <%= name %>
-
<%- for policy in accept -%>
ExitPolicy accept <%= policy %>
<%- end -%>
diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb
index 96ea930..6ca49de 100644
--- a/templates/torrc.global.erb
+++ b/templates/torrc.global.erb
@@ -1,10 +1,8 @@
# runtime
-
RunAsDaemon 1
DataDirectory <%= data_dir %>
# log
-
<%- if log_rules != [] then -%>
<%- for log_rule in log_rules -%>
Log <%= log_rule %>
diff --git a/templates/torrc.hidden_service.erb b/templates/torrc.hidden_service.erb
index d2f2d49..aed685f 100644
--- a/templates/torrc.hidden_service.erb
+++ b/templates/torrc.hidden_service.erb
@@ -1,5 +1,4 @@
# hidden service <%= name %>
-
HiddenServiceDir /var/tor/<%= name %>
<%- for port in ports -%>
HiddenServicePort <%= port %>
diff --git a/templates/torrc.relay.erb b/templates/torrc.relay.erb
index 2aee354..4754859 100644
--- a/templates/torrc.relay.erb
+++ b/templates/torrc.relay.erb
@@ -1,5 +1,4 @@
# relay
-
<%- if port != 0 then -%>
ORPort <%= port %>
<%- for listen_address in listen_addresses -%>
diff --git a/templates/torrc.socks.erb b/templates/torrc.socks.erb
index 0806f87..caf750d 100644
--- a/templates/torrc.socks.erb
+++ b/templates/torrc.socks.erb
@@ -1,5 +1,4 @@
# socks
-
SocksPort <%= port %>
<%- for listen_address in listen_addresses -%>
SocksListenAddress <%= listen_address %>