From 9ad81e1492bc76d787bf76e5de06a7db45d159b0 Mon Sep 17 00:00:00 2001
From: Bill MacAllister <whm@stanford.edu>
Date: Wed, 20 Nov 2013 23:17:48 -0800
Subject: [PATCH] syslog: just ignore /etc/syslog.conf when we don't want to
use it
Modifying the syslog support to not install /etc/syslog.conf affects
many manifest. Just ignore it for now.
---
manifests/syslog.pp | 7 ++++---
manifests/syslog/config/rsyslog.pp | 8 +-------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/manifests/syslog.pp b/manifests/syslog.pp
index eb2f95c..7d724ec 100644
--- a/manifests/syslog.pp
+++ b/manifests/syslog.pp
@@ -5,12 +5,13 @@
class base::syslog {
+ base::syslog::config::syslog { '/etc/syslog.conf':
+ ensure => present,
+ }
+
# RHEL4/5 are ancient and use syslog, everything modern uses rsyslog
if ( $::operatingsystem == 'RedHat' and $::lsbmajdistrelease < 6 ) {
service { 'syslog': ensure => running }
- base::syslog::config::syslog { '/etc/syslog.conf':
- ensure => present,
- }
} else {
file { '/etc/rsyslog.d':
ensure => directory,
diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp
index 6f99c24..de4021b 100644
--- a/manifests/syslog/config/rsyslog.pp
+++ b/manifests/syslog/config/rsyslog.pp
@@ -10,13 +10,7 @@ define base::syslog::config::rsyslog(
$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 {
+ if !$use_syslog_conf {
file {
'/etc/syslog.conf':
ensure => absent;
--
GitLab