Commit 5e5956db authored by Bill MacAllister's avatar Bill MacAllister
Browse files

Change handling of use_ parameters in rsyslog.pp to handle the cases

where booleans must be tested as strings.
parent 8112960f
release/003.023 (2014-05-07)
Change handling of use_ parameters in rsyslog.pp to handle the
cases where booleans must be tested as strings. (whm from Darren)
release/003.022 (2014-05-05)
Removed smtp-bypass iptable fragments. Move it to s_emailrouter
......
......@@ -49,8 +49,8 @@ define base::syslog::config::rsyslog(
$use_v5 = true,
) {
if !$use_syslog_conf {
if $use_v5 {
if ($use_syslog_conf != 'true' and $use_syslog_conf != true) {
if ($use_v5 == 'true' or $use_v5 == true) {
$rsyslog_tmpl = 'etc/rsyslog.d/20-templates-v5.conf'
$rsyslog_def = 'etc/rsyslog.d/95-default-v5.conf.erb'
} else {
......@@ -88,7 +88,7 @@ define base::syslog::config::rsyslog(
}
# Install the default catch all rule, or not, as desired.
if $use_default {
if ($use_default == 'true' or $use_default == true){
file { '/etc/rsyslog.d/95-default.conf':
ensure => present,
content => template("base/syslog/$rsyslog_def"),
......@@ -106,7 +106,7 @@ define base::syslog::config::rsyslog(
}
# Template for the base rsyslog configuration.
if $source {
if ($source == 'true' or $source == true){
$template = undef
} else {
$template = template('base/syslog/rsyslog.conf.erb')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment