[COOK-3784] Don't manage newlines with ERB

- Fixes #22
- Fixes #19

templates/default/supervisord.conf.erb

@@ -4,21 +4,20 @@
 ; Cookbook Name:: supervisor
 ;
 
-
 [unix_http_server]
 file=/var/run//supervisor.sock   ; (the path to the socket file)
 chmod=0700                       ; sockef file mode (default 0700)
+<% unless @inet_port.nil? %>
 
-<% unless @inet_port.nil? -%>
 [inet_http_server]
-port=<%= @inet_port -%>
-<%   unless @inet_username.nil? -%>
-username=<%= @inet_username -%>
-<%     unless @inet_password.nil? -%>
-password=<%= @inet_password -%>
-<%     end -%>
-<%   end -%>
-<% end -%>
+port=<%= @inet_port %>
+<% unless @inet_username.nil? %>
+username=<%= @inet_username %>
+<% unless @inet_password.nil? %>
+password=<%= @inet_password %>
+<% end %>
+<% end %>
+<% end %>
 
 [supervisord]
 logfile=<%= @node['supervisor']['log_dir'] %>/supervisord.log   ; (main log file;default $CWD/supervisord.log)
@@ -27,12 +26,12 @@ logfile_backups=<%= @node['supervisor']['logfile_backups'] %>   ; number of back
 loglevel=<%= @node['supervisor']['loglevel'] %>                 ; critical, error, warn, info, debug, trace, blather
 pidfile=/var/run/supervisord.pid                                ; (supervisord pidfile;default supervisord.pid)
 childlogdir=<%= @node['supervisor']['log_dir'] %>               ; ('AUTO' child log dir, default $TEMP)
+<% if @supervisor_version && @supervisor_version.match(/^3/) %>
 
-<% if !@supervisor_version.nil? and @supervisor_version.match(/^3/) -%>
 ; minfds & minprocs first appeared in supervisord 3.0
 minfds = <%= @supervisord_minfds %>
 minprocs = <%= @supervisord_minprocs %>
-<% end -%>
+<% end %>
 
 ; the below section must remain in the config file for RPC
 ; (supervisorctl/web interface) to work, additional interfaces may be