Move default file to template to take advantage of rsyslog_version fact and different flags available pre version 7 - Fixes #61
This commit is contained in:
Родитель
e6dddeec8b
Коммит
b8ef11c239
|
@ -34,7 +34,7 @@ class rsyslog::config {
|
|||
ensure => file,
|
||||
owner => 'root',
|
||||
group => $rsyslog::run_group,
|
||||
source => "puppet:///modules/rsyslog/${rsyslog::rsyslog_default_file}",
|
||||
content => template("${module_name}/${rsyslog::rsyslog_default_file}.erb"),
|
||||
require => Class['rsyslog::install'],
|
||||
notify => Class['rsyslog::service'],
|
||||
}
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
# File is managed by puppet
|
||||
|
||||
<% if @rsyslog_version and @rsyslog_version.split('.')[0].to_i < 7 -%>
|
||||
# Debian, Ubuntu
|
||||
RSYSLOGD_OPTIONS="-c4"
|
||||
<% end -%>
|
||||
|
||||
# CentOS, RedHat, Fedora
|
||||
SYSLOGD_OPTIONS="${RSYSLOGD_OPTIONS}"
|
Загрузка…
Ссылка в новой задаче