From 49a59bc491f08e9ad9224e99c700cb42ff7aa64d Mon Sep 17 00:00:00 2001
From: Bill MacAllister <whm@stanford.edu>
Date: Wed, 20 Nov 2013 23:12:08 -0800
Subject: [PATCH] syslog::rsyslog: Correct syntax error
---
manifests/syslog/config/rsyslog.pp | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp
index fcee57e..6f99c24 100644
--- a/manifests/syslog/config/rsyslog.pp
+++ b/manifests/syslog/config/rsyslog.pp
@@ -9,24 +9,27 @@ define base::syslog::config::rsyslog(
$replace = true,
$use_syslog_conf = true,
) {
+
+ # Install the last chance syslog handling. This is either in
+ # /etc/syslog.conf (depreciated) or in a rsyslog fragment.
if $use_syslog_conf {
base::syslog::config::syslog {'/etc/syslog.conf':
ensure => present,
}
} else {
- file {
- '/etc/syslog.conf':
- ensure => absent;
- '/etc/rsyslog.d/90-local.conf':
- ensure => present,
- source => 'puppet:///modules/base/syslog/etc/rsyslog.d/90-local.conf',
- owner => $owner,
- group => $group,
- mode => $mode;
- }
+ file {
+ '/etc/syslog.conf':
+ ensure => absent;
+ '/etc/rsyslog.d/90-local.conf':
+ ensure => present,
+ source => 'puppet:///modules/base/syslog/etc/rsyslog.d/90-local.conf',
+ owner => $owner,
+ group => $group,
+ mode => $mode;
}
}
+ # Template for the base rsyslog configuration.
if $source {
$template = undef
} else {
--
GitLab