diff --git a/spec/defines/component/action_spec.rb b/spec/defines/component/action_spec.rb index 5f8cfb23..54cbef3b 100644 --- a/spec/defines/component/action_spec.rb +++ b/spec/defines/component/action_spec.rb @@ -18,6 +18,7 @@ type: 'omelasticsearch', priority: 40, target: '50_rsyslog.conf', + dont_linebreak_actions: false, confdir: '/etc/rsyslog.d', config: { 'queue.type' => 'linkedlist', @@ -49,6 +50,7 @@ priority: 40, target: '50_rsyslog.conf', confdir: '/etc/rsyslog.d', + dont_linebreak_actions: false, facility: 'kern.*', config: { 'dynaFile' => 'remoteKern' @@ -67,6 +69,7 @@ type: 'omelasticsearch', priority: 40, target: '50_rsyslog.conf', + dont_linebreak_actions: false, confdir: '/etc/rsyslog.d', facility: '*.*', config: { diff --git a/templates/action.epp b/templates/action.epp index 83143c56..cd5ae026 100644 --- a/templates/action.epp +++ b/templates/action.epp @@ -2,7 +2,7 @@ $action_name, $type, $facility, -Boolean $dont_linebreak_actions, +Boolean $dont_linebreak_actions = false, $config | -%> # <%= $action_name %> diff --git a/templates/tasks.epp b/templates/tasks.epp index 12dc6bd2..66d1d3f8 100644 --- a/templates/tasks.epp +++ b/templates/tasks.epp @@ -12,10 +12,10 @@ $tasks <%}-%> <%- } elsif $config == 'action' { -%> <%- if ! $cfgval['facility'] or $cfgval['facility'] == '' { $facility = 'default' } else { $facility = $cfgval['facility'] } -%> - <%= epp('rsyslog/action.epp', { 'action_name' => $cfgval['name'], 'type' => $cfgval['type'], 'facility' => $facility, 'config' => $cfgval['config'],}) %> + <%= epp('rsyslog/action.epp', { 'action_name' => $cfgval['name'], 'type' => $cfgval['type'], 'facility' => $facility, 'config' => $cfgval['config'], 'dont_linebreak_actions' => $cfgval['dont_linebreak_actions'], }) %> <%-} elsif $config == 'stop' { -%> stop <%} elsif $config == 'exec' { -%> <%= epp('rsyslog/exec.epp', { 'value' => $cfgval, }) %><%-%> <%-}-%> -<%-}-%> \ No newline at end of file +<%-}-%>