summaryrefslogtreecommitdiff
path: root/templates/rsyslog.conf.erb
diff options
context:
space:
mode:
authorYasser Nabi <yassersaleemi@gmail.com>2014-07-07 13:30:14 +0100
committerYasser Nabi <yassersaleemi@gmail.com>2014-07-07 13:30:14 +0100
commit18a16ca041469d99bc0c5d27c46db62a06903ed8 (patch)
tree3538ab13d8d657666d85ae9b92cea981865190a3 /templates/rsyslog.conf.erb
parent3072553c9543b5c7769c54ed251bdfcce2967ce9 (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/rsyslog.conf.erb')
-rw-r--r--templates/rsyslog.conf.erb4
1 files changed, 4 insertions, 0 deletions
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 -%>