From 3b49f0c389e04971e1a3623e731e588b7fadb2d1 Mon Sep 17 00:00:00 2001 From: Yasser Nabi Date: Mon, 7 Jul 2014 13:30:14 +0100 Subject: 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). --- templates/client.conf.erb | 6 +++++- templates/rsyslog.conf.erb | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/client.conf.erb b/templates/client.conf.erb index bb40627..9dc5083 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 diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 097df0c..0339ef9 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 scope.lookupvar('rsyslog::v8plus') == true -%> +*.emerg :omusrmsg:* +<% else -%> *.emerg * +<% end -%> -- cgit v1.2.3