Avoid useless empty lines when some parameters aren't set
diff --git a/templates/main.cf.erb b/templates/main.cf.erb
index 33a063b..d69a690 100644
--- a/templates/main.cf.erb
+++ b/templates/main.cf.erb
@@ -829,13 +829,13 @@
virtual_transport = <%= @virtual_transport %>
<% if @virtual_transport == 'dovecot' -%>
dovecot_destination_recipient_limit = 1
-<% end -%>
<% end -%>
+<% end -%>
<% if @smtpd_delay_reject -%>
smtpd_delay_reject = <%= @smtpd_delay_reject %>
-<% end -%>
+<% end -%>
# SMTP restrictions (block bogus stuff)
<% if @smtpd_helo_required -%>
smtpd_helo_required = yes
@@ -845,15 +845,15 @@
<% @smtpd_client_restrictions.each do |line| -%>
<%= line %>,
<% end -%>
-<% end -%>
+<% end -%>
<% if !@smtpd_helo_restrictions.empty? -%>
smtpd_helo_restrictions =
<% @smtpd_helo_restrictions.each do |line| -%>
<%= line %>,
<% end -%>
-<% end -%>
+<% end -%>
<% if !@smtpd_sender_restrictions.empty? -%>
smtpd_sender_restrictions =
<% @smtpd_sender_restrictions.each do |line| -%>
@@ -873,23 +873,22 @@
check_policy_service unix:postgrey/socket,
<% end -%>
<% end -%>
-<% end -%>
+<% end -%>
<% if !@smtpd_data_restrictions.empty? -%>
smtpd_data_restrictions =
<% @smtpd_data_restrictions.each do |line| -%>
<%= line %>,
<% end -%>
-<% end -%>
+<% end -%>
<% if !@smtpd_end_of_data_restrictions.empty? -%>
smtpd_end_of_data_restrictions =
<% @smtpd_end_of_data_restrictions.each do |line| -%>
<%= line %>,
<% end -%>
+
<% end -%>
-
-
body_checks = regexp:<%= @config_directory %>/body_checks
<% if @canonical_maps -%>
