diff options
| author | Steffen Zieger <me@saz.sh> | 2014-07-13 13:45:08 +0200 |
|---|---|---|
| committer | Steffen Zieger <me@saz.sh> | 2014-07-13 13:45:08 +0200 |
| commit | 35a2ac1537b5d905b5a551f6709994122f7c3294 (patch) | |
| tree | ff711a2dbb45b8d7d8975778b11cf06d7544554b /templates | |
| parent | 67c7c501b916ebd1a27a8a218d49602339526c4f (diff) | |
| parent | eb7c36ae207abbff4a5121dfff8456e3609df45f (diff) | |
Merge pull request #87 from yasn77/master
Add parameter 'v8plus' for rsyslog version 8+
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/client.conf.erb | 6 | ||||
| -rw-r--r-- | templates/rsyslog.conf.erb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb index bb40627..d72e080 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -165,7 +165,11 @@ mail.* -/var/log/maillog cron.* /var/log/cron # Everybody gets emergency messages -*.emerg * +<% if @rsyslog_version.split('.')[0].to_i >= 8 -%> +*.emerg :omusrmsg:* +<% else -%> +*.emerg * +<% end -%> # Save news errors of level crit and higher in a special file. uucp,news.crit -/var/log/spooler diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 097df0c..446c91e 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -35,4 +35,8 @@ $IncludeConfig <%= scope.lookupvar('rsyslog::rsyslog_d') -%>*.conf # # Emergencies are sent to everybody logged in. # +<% if @rsyslog_version.split('.')[0].to_i >= 8 -%> +*.emerg :omusrmsg:* +<% else -%> *.emerg * +<% end -%> |