Skip to content
Snippets Groups Projects
Commit 9ad81e14 authored by Bill MacAllister's avatar Bill MacAllister
Browse files

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.
parent 49a59bc4
No related branches found
No related tags found
No related merge requests found
...@@ -5,12 +5,13 @@ ...@@ -5,12 +5,13 @@
class base::syslog { class base::syslog {
base::syslog::config::syslog { '/etc/syslog.conf':
ensure => present,
}
# RHEL4/5 are ancient and use syslog, everything modern uses rsyslog # RHEL4/5 are ancient and use syslog, everything modern uses rsyslog
if ( $::operatingsystem == 'RedHat' and $::lsbmajdistrelease < 6 ) { if ( $::operatingsystem == 'RedHat' and $::lsbmajdistrelease < 6 ) {
service { 'syslog': ensure => running } service { 'syslog': ensure => running }
base::syslog::config::syslog { '/etc/syslog.conf':
ensure => present,
}
} else { } else {
file { '/etc/rsyslog.d': file { '/etc/rsyslog.d':
ensure => directory, ensure => directory,
......
...@@ -10,13 +10,7 @@ define base::syslog::config::rsyslog( ...@@ -10,13 +10,7 @@ define base::syslog::config::rsyslog(
$use_syslog_conf = true, $use_syslog_conf = true,
) { ) {
# Install the last chance syslog handling. This is either in if !$use_syslog_conf {
# /etc/syslog.conf (depreciated) or in a rsyslog fragment.
if $use_syslog_conf {
base::syslog::config::syslog {'/etc/syslog.conf':
ensure => present,
}
} else {
file { file {
'/etc/syslog.conf': '/etc/syslog.conf':
ensure => absent; ensure => absent;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment