From 9fcacf58190007e27b01e623f91a63ad481bc43e Mon Sep 17 00:00:00 2001 From: Yasser Nabi Date: Thu, 10 Jul 2014 19:33:33 +0100 Subject: Use fact for rsyslog version instead of param With the introduction of the rsyslog_version fact, it seems more consistent to use that to determine what version of the config to use. The fact has also been updated to support FreeBSD (although not well tested) --- templates/client.conf.erb | 2 +- templates/rsyslog.conf.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 9dc5083..d72e080 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -165,7 +165,7 @@ mail.* -/var/log/maillog cron.* /var/log/cron # Everybody gets emergency messages -<% if scope.lookupvar('rsyslog::v8plus') == true -%> +<% if @rsyslog_version.split('.')[0].to_i >= 8 -%> *.emerg :omusrmsg:* <% else -%> *.emerg * diff --git a/templates/rsyslog.conf.erb b/templates/rsyslog.conf.erb index 0339ef9..446c91e 100644 --- a/templates/rsyslog.conf.erb +++ b/templates/rsyslog.conf.erb @@ -35,7 +35,7 @@ $IncludeConfig <%= scope.lookupvar('rsyslog::rsyslog_d') -%>*.conf # # Emergencies are sent to everybody logged in. # -<% if scope.lookupvar('rsyslog::v8plus') == true -%> +<% if @rsyslog_version.split('.')[0].to_i >= 8 -%> *.emerg :omusrmsg:* <% else -%> *.emerg * -- cgit v1.2.3