1005f86180
This change updates the rsyslog default for the custom config option to be '' rather than undef so that the correct file is used for the client and service configurations under puppet 4. Additionally this change fixes the parameter check for rabbit_hosts for the openstack module so that it passes. Change-Id: I128abd4cc27297d76db8f6d05e583cfbeae8abc7 Closes-Bug: #1507614
38 lines
894 B
Puppet
38 lines
894 B
Puppet
#
|
|
#
|
|
#
|
|
|
|
class rsyslog::server (
|
|
$enable_tcp = true,
|
|
$enable_udp = true,
|
|
$server_dir = '/srv/log/',
|
|
$custom_config = '',
|
|
$high_precision_timestamps = false,
|
|
$escapenewline = false,
|
|
$port = '514',
|
|
) inherits rsyslog {
|
|
|
|
File {
|
|
owner => root,
|
|
group => $rsyslog::params::run_group,
|
|
mode => 0640,
|
|
require => Class["rsyslog::config"],
|
|
notify => Class["rsyslog::service"],
|
|
}
|
|
|
|
file { $rsyslog::params::rsyslog_d:
|
|
purge => true,
|
|
recurse => true,
|
|
force => true,
|
|
ensure => directory,
|
|
}
|
|
|
|
file { $rsyslog::params::server_conf:
|
|
ensure => present,
|
|
content => $custom_config ? {
|
|
'' => template("${module_name}/00-server.conf.erb"),
|
|
default => template($custom_config),
|
|
},
|
|
}
|
|
}
|