summaryrefslogtreecommitdiff
path: root/puppet/modules
diff options
context:
space:
mode:
authorirregulator <irregulator@riseup.net>2014-06-03 17:37:52 +0300
committerelijah <elijah@riseup.net>2014-07-01 16:05:41 -0700
commitee8064a8281c3f933aeea219baec822ec8f52b84 (patch)
tree52f0cb48e39a331e3b8351cb10ba84192d623a6c /puppet/modules
parentabb89aca59915223ec3b6ca999d3a15ba8ede594 (diff)
Remove unneeded newlines from obfsproxy.conf
Diffstat (limited to 'puppet/modules')
-rw-r--r--puppet/modules/obfsproxy/templates/etc_conf.erb7
1 files changed, 3 insertions, 4 deletions
diff --git a/puppet/modules/obfsproxy/templates/etc_conf.erb b/puppet/modules/obfsproxy/templates/etc_conf.erb
index 10f6a7f7..8959ef78 100644
--- a/puppet/modules/obfsproxy/templates/etc_conf.erb
+++ b/puppet/modules/obfsproxy/templates/etc_conf.erb
@@ -2,11 +2,10 @@ TRANSPORT=<%= @transport %>
PORT=<%= @port %>
DEST_IP=<%= @dest_ip %>
DEST_PORT=<%= @dest_port %>
-<% if @transport == "scramblesuit" %>
+<% if @transport == "scramblesuit" -%>
PARAM=--password=<%= @param %>
-<% else %>
+<% else -%>
PARAM=<%= @param %>
-<% end %>
+<% end -%>
LOG=<%= @log_level %>
BINDADDR=<%= @bind_address %>
-