Skip to content

Commit df3fa26

Browse files
committed
add usrmsg_users parameter, fixes #286
1 parent 24a9536 commit df3fa26

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

REFERENCE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ The following parameters are available in the `rsyslog` class:
8585
* [`im_journal_ignore_previous_messages`](#-rsyslog--im_journal_ignore_previous_messages)
8686
* [`rsyslog_conf_mode`](#-rsyslog--rsyslog_conf_mode)
8787
* [`rsyslog_d_mode`](#-rsyslog--rsyslog_d_mode)
88+
* [`usrmsg_users`](#-rsyslog--usrmsg_users)
8889

8990
##### <a name="-rsyslog--rsyslog_package_name"></a>`rsyslog_package_name`
9091

@@ -422,6 +423,14 @@ Force a specific mode on the rsyslog.d directory
422423

423424
Default value: `undef`
424425

426+
##### <a name="-rsyslog--usrmsg_users"></a>`usrmsg_users`
427+
428+
Data type: `Array[String[1]]`
429+
430+
Array of user names that will receive emergency messages when logged
431+
432+
Default value: `['*']`
433+
425434
### <a name="rsyslog--client"></a>`rsyslog::client`
426435

427436
This class manages rsyslog as client

manifests/init.pp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,9 @@
131131
# @param rsyslog_d_mode
132132
# Force a specific mode on the rsyslog.d directory
133133
#
134+
# @param usrmsg_users
135+
# Array of user names that will receive emergency messages when logged
136+
#
134137
class rsyslog (
135138
Variant[Boolean[false], String[1]] $rsyslog_package_name = $rsyslog::params::rsyslog_package_name,
136139
Variant[Boolean[false], String[1]] $relp_package_name = $rsyslog::params::relp_package_name,
@@ -174,6 +177,7 @@
174177
Optional[Enum['on', 'off']] $im_journal_ignore_previous_messages = $rsyslog::params::im_journal_ignore_previous_messages,
175178
Optional[Stdlib::Filemode] $rsyslog_conf_mode = undef,
176179
Optional[Stdlib::Filemode] $rsyslog_d_mode = undef,
180+
Array[String[1]] $usrmsg_users = ['*'],
177181
) inherits rsyslog::params {
178182
require rsyslog::install
179183

templates/client/local.conf.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ mail.* -/var/log/maillog
9191

9292
# Log cron stuff
9393
cron.* /var/log/cron
94-
95-
# Everybody gets emergency messages
9694
<% elsif scope['rsyslog::log_style'] == 'freebsd' -%>
9795
*.err;kern.warning;auth.notice;mail.crit /dev/console
9896
*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err /var/log/messages

templates/rsyslog.conf.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,6 @@ $imjournalRatelimitBurst <%=@im_journal_ratelimit_burst %>
9999
$IncludeConfig <%= @rsyslog_d -%>/*.conf
100100

101101
#
102-
# Emergencies are sent to everybody logged in.
102+
# Emergencies are sent to <%= @usrmsg_users.join(',') -%> logged in.
103103
#
104-
*.emerg :omusrmsg:*
104+
*.emerg :omusrmsg:<%= @usrmsg_users.join(',') %>

0 commit comments

Comments
 (0)