avoid useless whitespace in config files

Author: saz

templates/client/config.conf.erb

@@ -71,11 +71,11 @@ $ActionSendStreamDriverPermittedPeer <%= @ssl_permitted_peer %>
 # Load RELP module.
 $ModLoad omrelp
 <% elsif $remote_servers -%>
-  <% @remote_servers.flatten.compact.each do |server| -%>
-    <% if server['protocol'].downcase == 'relp' %>
+<% @remote_servers.flatten.compact.each do |server| -%>
+<% if server['protocol'].downcase == 'relp' %>
 $ModLoad omrelp
-      <% break -%>
-    <% end -%>
-  <% end -%>
+<% break -%>
+<% end -%>
+<% end -%>
 <% end -%>
 

templates/client/remote.conf.erb

@@ -1,55 +1,55 @@
 <% if @remote_servers and @remote_servers.any? -%>
-  <% @remote_servers.flatten.compact.each do |server| -%>
-    <% if server['pattern'] and server['pattern'] != ''-%>
-      <% pattern = server['pattern'] -%>
-    <% else -%>
-      <% pattern = '*.*' -%>
-    <% end -%>
-    <% if server['protocol'].downcase == 'tcp' -%>
-      <% protocol = '@@' -%>
-    <% elsif server['protocol'].downcase == 'relp'-%>
-      <% protocol = ':omrelp:' -%>
-    <% else -%>
-      <% protocol = '@' -%>
-    <% end -%>
-    <% if server['host'] and server['host'] != ''-%>
-      <% host = server['host'] -%>
-    <% else -%>
-      <% host = 'localhost' -%>
-    <% end -%>
-    <% if server['port'] and server['port'] != ''-%>
-      <% port = server['port'] -%>
-    <% else -%>
-      <% if server['protocol'].downcase == 'relp' -%>
-        <% port = '20514' -%>
-      <% else -%>
-        <% port = '514' -%>
-      <% end -%>
-    <% end -%>
-    <% if server['format'] -%>
-      <% format = ";#{server['format']}" -%>
-      <% format_type = server['format'] -%>
-    <% else -%>
-      <% format = '' -%>
-      <% format_type = 'the default' -%>
-    <% end -%>
-    <% if server['thendrop'] -%>
-      <% dropaction = '& ~' -%>
-    <% else -%>
-      <% dropaction = '' -%>
-    <% end -%>
-    # Sending logs that match <%= pattern %> to <%= host %> via <%= server['protocol'].downcase %> on <%= port %> using <%=format_type %> format.
-    <%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
-    <%= dropaction %>
-  <% end -%>
+<% @remote_servers.flatten.compact.each do |server| -%>
+<% if server['pattern'] and server['pattern'] != ''-%>
+<% pattern = server['pattern'] -%>
+<% else -%>
+<% pattern = '*.*' -%>
+<% end -%>
+<% if server['protocol'].downcase == 'tcp' -%>
+<% protocol = '@@' -%>
+<% elsif server['protocol'].downcase == 'relp'-%>
+<% protocol = ':omrelp:' -%>
+<% else -%>
+<% protocol = '@' -%>
+<% end -%>
+<% if server['host'] and server['host'] != ''-%>
+<% host = server['host'] -%>
+<% else -%>
+<% host = 'localhost' -%>
+<% end -%>
+<% if server['port'] and server['port'] != ''-%>
+<% port = server['port'] -%>
+<% else -%>
+<% if server['protocol'].downcase == 'relp' -%>
+<% port = '20514' -%>
+<% else -%>
+<% port = '514' -%>
+<% end -%>
+<% end -%>
+<% if server['format'] -%>
+<% format = ";#{server['format']}" -%>
+<% format_type = server['format'] -%>
+<% else -%>
+<% format = '' -%>
+<% format_type = 'the default' -%>
+<% end -%>
+<% if server['thendrop'] -%>
+<% dropaction = '& ~' -%>
+<% else -%>
+<% dropaction = '' -%>
+<% end -%>
+<%= pattern %> to <%= host %> via <%= server['protocol'].downcase %> on <%= port %> using <%=format_type %> format.
+<%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
+<%= dropaction %>
+<% end -%>
 <% elsif @log_remote -%>
-  <% if @remote_type == 'tcp' -%>
-    <% protocol = '@@' -%>
-  <% elsif @remote_type == 'relp' -%>
-    <% protocol = ':omrelp:' -%>
-  <% else -%>
-    <% protocol = '@' -%>
-  <% end -%>
+<% if @remote_type == 'tcp' -%>
+<% protocol = '@@' -%>
+<% elsif @remote_type == 'relp' -%>
+<% protocol = ':omrelp:' -%>
+<% else -%>
+<% protocol = '@' -%>
+<% end -%>
 # Log to remote syslog server using <%= @remote_type %>
 *.* <%= protocol -%><%= @server -%>:<%= @port -%>;<%= @remote_forward_format -%>
 <% end -%>

templates/database.conf.erb

@@ -1,6 +1,7 @@
+#
 # File is managed by Puppet
+#
 
 ## Configuration file for rsyslog-<%= @backend %>
-
 $ModLoad om<%= @backend %>
 *.* :om<%= @backend -%>:<%= @server -%>,<%= @database -%>,<%= @username -%>,<%= @password %>

templates/rsyslog.conf.erb

@@ -1,6 +1,7 @@
 #
 # File is managed by puppet
 #
+
 $MaxMessageSize <%= @max_message_size %>
 <% if @preserve_fqdn -%>
 $PreserveFQDN on
@@ -12,11 +13,9 @@ $LocalHostName <%= @local_host_name %>
 #################
 #### MODULES ####
 #################
-
 <% @modules.each do |module_row| -%>
 <%= module_row %>
 <% end -%>
-
 <% @extra_modules.each do |mod| -%>
 $ModLoad <%= mod %>
 <% end -%>