diff options
| author | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-07 13:30:14 +0100 |
|---|---|---|
| committer | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-07 13:30:14 +0100 |
| commit | 18a16ca041469d99bc0c5d27c46db62a06903ed8 (patch) | |
| tree | 3538ab13d8d657666d85ae9b92cea981865190a3 /templates/client.conf.erb | |
| parent | 3072553c9543b5c7769c54ed251bdfcce2967ce9 (diff) | |
Add parameter 'v8plus' for rsyslog version 8+
There has been some significant config changes in versions 8+ of
Rsyslog, one of which is causing deprecated warnings with the Puppet
module. This commit adds are class boolean parameter 'v8plus' to signify
if the version of Rsyslog is version 8 or greater.
Also, the deprecation warning is fixed (correct syntax is used).
Diffstat (limited to 'templates/client.conf.erb')
| -rw-r--r-- | templates/client.conf.erb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/templates/client.conf.erb b/templates/client.conf.erb index c10512c..5733972 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 scope.lookupvar('rsyslog::v8plus') == true -%> +*.emerg :omusrmsg:* +<% else -%> +*.emerg * +<% end -%> # Save news errors of level crit and higher in a special file. uucp,news.crit -/var/log/spooler |