fix issues after refactoring

Author: saz

manifests/snippet.pp

@@ -20,8 +20,6 @@
   Enum['present', 'file', 'absent'] $ensure = 'present',
   Optional[Stdlib::Filemode] $file_mode = undef,
 ) {
-  require rsyslog
-
   if $file_mode {
     $file_mode_real = $file_mode
   } else {

templates/client/config.conf.erb

@@ -8,14 +8,14 @@ $ActionQueueTimeoutEnqueue <%= @spool_timeoutenqueue -%>   # time to wait before
 <% end -%>
 $ActionQueueType LinkedList     # run asynchronously
 $ActionResumeRetryCount -1      # infinety retries if host is down
-<% if @log_templates and ! @log_templates.empty?-%>
+<% if @log_templates and ! @log_templates.empty? -%>
 
 # Define custom logging templates
 <% @log_templates.flatten.compact.each do |log_template| -%>
 $template <%= log_template['name'] %>,"<%= log_template['template'] %>"
 <% end -%>
 <% end -%>
-<% if @log_filters -%>
+<% if @log_filters and ! @log_filters.empty? -%>
 
 # Define custom if/then log conditions
 <% @log_filters.each do |log_filter| -%>

templates/rsyslog.conf.erb

@@ -97,7 +97,7 @@ $imjournalRatelimitBurst <%=@im_journal_ratelimit_burst %>
 #
 # Include all config files in <%= @rsyslog_d %>
 #
-$IncludeConfig <%= @rsyslog_d -%>*.conf
+$IncludeConfig <%= @rsyslog_d -%>/*.conf
 
 #
 # Emergencies are sent to everybody logged in.