This commit is contained in:
Steffen Zieger 2016-08-03 15:49:18 +02:00
Родитель 4664bb38ee
Коммит dc30e40b36
7 изменённых файлов: 15 добавлений и 15 удалений

Просмотреть файл

@ -116,7 +116,7 @@ class rsyslog::client (
} }
if $ssl_auth_mode != 'anon' and $rsyslog::ssl == false { if $ssl_auth_mode != 'anon' and $rsyslog::ssl == false {
fail("You need to enable SSL in order to use ssl_auth_mode.") fail('You need to enable SSL in order to use ssl_auth_mode.')
} }
if $ssl_permitted_peer and $ssl_auth_mode != 'x509/name' { if $ssl_permitted_peer and $ssl_auth_mode != 'x509/name' {

Просмотреть файл

@ -33,8 +33,8 @@ class rsyslog::database (
$db_module = "om${backend}" $db_module = "om${backend}"
case $backend { case $backend {
mysql: { $db_package = $rsyslog::mysql_package_name } 'mysql': { $db_package = $rsyslog::mysql_package_name }
pgsql: { $db_package = $rsyslog::pgsql_package_name } 'pgsql': { $db_package = $rsyslog::pgsql_package_name }
default: { fail("Unsupported backend: ${backend}. Only MySQL (mysql) and PostgreSQL (pgsql) are supported.") } default: { fail("Unsupported backend: ${backend}. Only MySQL (mysql) and PostgreSQL (pgsql) are supported.") }
} }

Просмотреть файл

@ -37,7 +37,7 @@ define rsyslog::imfile(
$imfile_template = 'rsyslog/imfile.erb', $imfile_template = 'rsyslog/imfile.erb',
) { ) {
include rsyslog include ::rsyslog
$extra_modules = $rsyslog::extra_modules $extra_modules = $rsyslog::extra_modules
# This mode should defined when having multiline messages. # This mode should defined when having multiline messages.

Просмотреть файл

@ -43,7 +43,7 @@ class rsyslog (
$local_host_name = undef, $local_host_name = undef,
$max_message_size = $rsyslog::params::max_message_size, $max_message_size = $rsyslog::params::max_message_size,
$system_log_rate_limit_interval = $rsyslog::params::system_log_rate_limit_interval, $system_log_rate_limit_interval = $rsyslog::params::system_log_rate_limit_interval,
$system_log_rateLimit_burst = $rsyslog::params::system_log_rateLimit_burst, $system_log_rate_limit_burst = $rsyslog::params::system_log_rate_limit_burst,
$extra_modules = $rsyslog::params::extra_modules, $extra_modules = $rsyslog::params::extra_modules,
$default_template = $rsyslog::params::default_template, $default_template = $rsyslog::params::default_template,
$msg_reduction = $rsyslog::params::msg_reduction, $msg_reduction = $rsyslog::params::msg_reduction,
@ -54,12 +54,12 @@ class rsyslog (
$im_journal_ratelimit_burst = $rsyslog::params::im_journal_ratelimit_burst, $im_journal_ratelimit_burst = $rsyslog::params::im_journal_ratelimit_burst,
$im_journal_ignore_previous_messages = $rsyslog::params::im_journal_ignore_previous_messages $im_journal_ignore_previous_messages = $rsyslog::params::im_journal_ignore_previous_messages
) inherits rsyslog::params { ) inherits rsyslog::params {
class { 'rsyslog::install': } class { '::rsyslog::install': }
class { 'rsyslog::config': } class { '::rsyslog::config': }
if $extra_modules != [] { if $extra_modules != [] {
class { 'rsyslog::modload': } class { '::rsyslog::modload': }
} }
class { 'rsyslog::service': } class { '::rsyslog::service': }
} }

Просмотреть файл

@ -15,7 +15,7 @@ class rsyslog::params {
$max_message_size = '2k' $max_message_size = '2k'
$system_log_rate_limit_interval = '1' $system_log_rate_limit_interval = '1'
$system_log_rateLimit_burst = '100' $system_log_rate_limit_burst = '100'
$purge_rsyslog_d = false $purge_rsyslog_d = false
$extra_modules = [] $extra_modules = []
$default_template = undef $default_template = undef
@ -30,7 +30,7 @@ class rsyslog::params {
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
case $::operatingsystem { case $::operatingsystem {
'Debian': { default: {
$log_user = 'root' $log_user = 'root'
$run_user = 'root' $run_user = 'root'
$run_group = 'root' $run_group = 'root'
@ -194,7 +194,7 @@ class rsyslog::params {
'FreeBSD': { 'FreeBSD': {
$rsyslog_package_name = 'sysutils/rsyslog8' $rsyslog_package_name = 'sysutils/rsyslog8'
$relp_package_name = false $relp_package_name = false
$mysql_package_name = false $mysql_package_name = false
$pgsql_package_name = false $pgsql_package_name = false
$gnutls_package_name = false $gnutls_package_name = false
$package_status = 'present' $package_status = 'present'
@ -229,7 +229,7 @@ class rsyslog::params {
'Gentoo': { 'Gentoo': {
$rsyslog_package_name = 'app-admin/rsyslog' $rsyslog_package_name = 'app-admin/rsyslog'
$relp_package_name = false $relp_package_name = false
$mysql_package_name = 'rsyslog-mysql' $mysql_package_name = 'rsyslog-mysql'
$pgsql_package_name = 'rsyslog-pgsql' $pgsql_package_name = 'rsyslog-pgsql'
$gnutls_package_name = false $gnutls_package_name = false
$package_status = 'present' $package_status = 'present'

Просмотреть файл

@ -22,7 +22,7 @@ define rsyslog::snippet(
$ensure = 'present', $ensure = 'present',
$file_mode = 'undef' $file_mode = 'undef'
) { ) {
include rsyslog include ::rsyslog
if $file_mode == 'undef' { if $file_mode == 'undef' {
$file_mode_real = $rsyslog::perm_file $file_mode_real = $rsyslog::perm_file

Просмотреть файл

@ -30,7 +30,7 @@ $MaxMessageSize <%= scope.lookupvar('rsyslog::max_message_size') %>
# Set rate limit for messages received. # Set rate limit for messages received.
# #
$SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::system_log_rate_limit_interval') %> $SystemLogRateLimitInterval <%= scope.lookupvar('rsyslog::system_log_rate_limit_interval') %>
$SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::system_log_rateLimit_burst') %> $SystemLogRateLimitBurst <%= scope.lookupvar('rsyslog::system_log_rate_limit_burst') %>
<% if scope.lookupvar('rsyslog::default_template') and scope.lookupvar('rsyslog::default_template') != :undef -%> <% if scope.lookupvar('rsyslog::default_template') and scope.lookupvar('rsyslog::default_template') != :undef -%>
# #