diff --git a/manifests/syslog/config/rsyslog.pp b/manifests/syslog/config/rsyslog.pp index fcee57e877b437d74937d8da15201ec4dc151b25..6f99c24f551d09d8463b291cb0647e1e2efa9014 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 {