Skip to content

Commit

Permalink
Generate strings:reference.
Browse files Browse the repository at this point in the history
  • Loading branch information
bschonec committed Sep 18, 2023
1 parent f654ecb commit 355d76b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
2 changes: 2 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -698,6 +698,8 @@ Data type: `Boolean`



Default value: `$rsyslog::dont_linebreak_actions`

##### <a name="-rsyslog--component--action--config"></a>`config`

Data type: `Hash`
Expand Down
3 changes: 1 addition & 2 deletions manifests/component/action.pp
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
String $target,
String $confdir,
String $type,
Boolean $dont_linebreak_actions,
#= $rsyslog::dont_linebreak_actions,
Boolean $dont_linebreak_actions = $rsyslog::dont_linebreak_actions,
Hash $config = {},
String[1] $facility = 'default',
String[1] $format = '<%= $content %>'
Expand Down
3 changes: 3 additions & 0 deletions spec/defines/component/action_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
type: 'omelasticsearch',
priority: 40,
target: '50_rsyslog.conf',
dont_linebreak_actions: false,
confdir: '/etc/rsyslog.d',
config: {
'queue.type' => 'linkedlist',
Expand Down Expand Up @@ -49,6 +50,7 @@
priority: 40,
target: '50_rsyslog.conf',
confdir: '/etc/rsyslog.d',
dont_linebreak_actions: false,
facility: 'kern.*',
config: {
'dynaFile' => 'remoteKern'
Expand All @@ -67,6 +69,7 @@
type: 'omelasticsearch',
priority: 40,
target: '50_rsyslog.conf',
dont_linebreak_actions: false,
confdir: '/etc/rsyslog.d',
facility: '*.*',
config: {
Expand Down
2 changes: 1 addition & 1 deletion templates/action.epp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
$action_name,
$type,
$facility,
Boolean $dont_linebreak_actions,
Boolean $dont_linebreak_actions = false,
$config
| -%>
# <%= $action_name %>
Expand Down
4 changes: 2 additions & 2 deletions templates/tasks.epp
Original file line number Diff line number Diff line change
Expand Up @@ -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, }) %><%-%>
<%-}-%>
<%-}-%>
<%-}-%>

0 comments on commit 355d76b

Please sign in to comment.