simplify some comparisons in templates

Author: saz

REFERENCE.md

@@ -986,11 +986,11 @@ Default value: `undef`
 
 ##### <a name="-rsyslog--server--rules"></a>`rules`
 
-Data type: `Optional[Array[Hash]]`
+Data type: `Array[Hash]`
 
 Array of hashes for configuring custom rules for the server. If set, this replaces the default rules
 
-Default value: `undef`
+Default value: `[]`
 
 ## Defined types
 

manifests/server.pp

@@ -118,7 +118,7 @@
   Optional[String[1]] $actionfiletemplate_cust = undef,
   Optional[String[1]] $actionfiletemplate = undef,
   Optional[Enum['year', 'YEAR', 'month', 'MONTH', 'day', 'DAY']] $rotate = undef,
-  Optional[Array[Hash]] $rules = undef,
+  Array[Hash] $rules = [],
 ) inherits rsyslog::params {
   include rsyslog
 

templates/client/config.conf.erb

@@ -33,12 +33,12 @@ $template <%= @actionfiletemplate %>, <%= @actionfiletemplate_cust %>
 $ActionFileDefaultTemplate <%= @actionfiletemplate %>
 <% else -%>
 
-<% if @high_precision_timestamps == false -%>
-# Use default format
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-<% else -%>
+<% if @high_precision_timestamps -%>
 # Use high precision timestamp format.
 $ActionFileDefaultTemplate RSYSLOG_FileFormat
+<% else -%>
+# Use default format
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 <% end -%>
 <% end -%>
 

templates/rsyslog.conf.erb

@@ -5,7 +5,7 @@ $MaxMessageSize <%= @max_message_size %>
 <% if @preserve_fqdn -%>
 $PreserveFQDN on
 <% end -%>
-<% if @local_host_name and @local_host_name != :undef -%>
+<% if @local_host_name -%>
 $LocalHostName <%= @local_host_name %>
 <% end -%>
 
@@ -32,21 +32,21 @@ $KLogPermitNonKernelFacility on
 #
 # Set rate limit for messages received.
 #
-<%- if @system_log_rate_limit_interval and @system_log_rate_limit_interval != :undef-%>
+<%- if @system_log_rate_limit_interval -%>
 $SystemLogRateLimitInterval <%= @system_log_rate_limit_interval %>
 <%- end -%>
-<%- if @system_log_rate_limit_burst and @system_log_rate_limit_burst != :undef -%>
+<%- if @system_log_rate_limit_burst -%>
 $SystemLogRateLimitBurst <%= @system_log_rate_limit_burst %>
 <%- end -%>
 
-<% if @default_template and @default_template != :undef and @default_template_customisation and @default_template_customisation != :undef -%>
+<% if @default_template and @default_template_customisation -%>
 #
 # Custom setting for ActionFileDefaultTemplate
 #
 $template <%= @default_template %>,<%= @default_template_customisation %>
 
 <% end -%>
-<% if @default_template  and @default_template != :undef -%>
+<% if @default_template -%>
 #
 # Sets a default template for file action
 #
@@ -81,16 +81,16 @@ $OmitLocalLogging on
 <% end -%>
 
 # Settings for imjournal (If supported)
-<% if @im_journal_statefile and @im_journal_statefile != :undef -%>
+<% if @im_journal_statefile -%>
 $imjournalStateFile <%=@im_journal_statefile %>
 <% end -%>
-<% if @im_journal_ignore_previous_messages and @im_journal_ignore_previous_messages != :undef -%>
+<% if @im_journal_ignore_previous_messages -%>
 $imjournalIgnorePreviousMessages <%=@im_journal_ignore_previous_messages %>
 <% end -%>
-<% if @im_journal_ratelimit_interval and @im_journal_ratelimit_interval != :undef -%>
+<% if @im_journal_ratelimit_interval -%>
 $imjournalRatelimitInterval <%=@im_journal_ratelimit_interval %>
 <% end -%>
-<% if @im_journal_ratelimit_burst and @im_journal_ratelimit_burst != :undef -%>
+<% if @im_journal_ratelimit_burst -%>
 $imjournalRatelimitBurst <%=@im_journal_ratelimit_burst %>
 <% end -%>
 

templates/server-default.conf.erb

@@ -21,7 +21,7 @@ $Template dynDebug,"<%= @server_dir -%>/%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<
 $Template dynMessages,"<%= @server_dir -%>/%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%<%= @logpath -%>messages"
 
 # Rules
-<% if @rules and @rules != :undef -%>
+<% if @rules -%>
 <% @rules.flatten.compact.each do |rules| -%>
 <% if rules['selector'] and rules['selector'] != '' and rules['action'] and rules['action'] != '' -%>
 <%= rules['selector'] %> <%= rules['action'] %>

templates/server-hostname.conf.erb

@@ -19,7 +19,7 @@ $Template dynDebug,"<%= @server_dir -%>/%hostname%<%= @logpath -%>debug"
 $Template dynMessages,"<%= @server_dir -%>/%hostname%<%= @logpath -%>messages"
 
 # Rules
-<% if @rules and @rules != :undef -%>
+<% if @rules -%>
 <% @rules.flatten.compact.each do |rules| -%>
 <% if rules['selector'] and rules['selector'] != '' and rules['action'] and rules['action'] != '' -%>
 <%= rules['selector'] %> <%= rules['action'] %>

templates/server/_default-header.conf.erb

@@ -33,16 +33,16 @@ if <%= log_filter['expression'] %> then <%= log_filter['action'] %>
 $ActionFileDefaultTemplate <%= @actionfiletemplate %>
 <% else -%>
 
-<% if @high_precision_timestamps == false -%>
+<% if @high_precision_timestamps -%>
 #
-# Use traditional timestamp format.
+# Use high precision timestamp format.
 #
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+$ActionFileDefaultTemplate RSYSLOG_FileFormat
 <% else -%>
 #
-# Use high precision timestamp format.
+# Use traditional timestamp format.
 #
-$ActionFileDefaultTemplate RSYSLOG_FileFormat
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
 <% end -%>
 <% end -%>