tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restructured syslog module

Browse source
This commit is contained in:
Ossi Salmi 2011-10-12 13:38:12 +03:00 • committed by Timo Mkinen
parent 0ed66bddf9
commit 592c53a546
1 changed files with 32 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

75
syslog/manifests/init.pp
View file

@ -1,5 +1,4 @@
# Common syslog configuration
# Install syslog client
# #
# === Global variables: # === Global variables:
# #
@ -7,13 +6,11 @@
# Syslog type to use. Valid values are syslogd and rsyslog. # Syslog type to use. Valid values are syslogd and rsyslog.
# Default depends on operating system. # Default depends on operating system.
# #
# $syslog_server: # $syslog_group:
# Address of remote syslog server where to send logs. # Group name which has permissions to read logs. Defaults to
# wheel or root depending on operating system.
# #
# $syslog_tlsserver: class syslog::common {
# Address of remote syslog server where to send logs over TCP/TLS.
#
class syslog::client {
if !$syslog_type { if !$syslog_type {
case $operatingsystem { case $operatingsystem {
@ -29,6 +26,30 @@ class syslog::client {
} }
} }
if $syslog_group {
$group = $syslog_group
} else {
if $operatingsystem == "OpenBSD" {
$group = "wheel"
} else {
$group = "root"
}
}
}
# Install syslog client
#
# === Global variables:
#
# $syslog_server:
# Address of remote syslog server where to send logs.
#
# $syslog_tlsserver:
# Address of remote syslog server where to send logs over TCP/TLS.
#
class syslog::client inherits syslog::common {
case $syslog_type { case $syslog_type {
"syslogd": { include syslog::client::syslogd } "syslogd": { include syslog::client::syslogd }
"rsyslog": { include syslog::client::rsyslog } "rsyslog": { include syslog::client::rsyslog }
@ -128,42 +149,10 @@ class syslog::client::rsyslog {
# #
# === Global variables: # === Global variables:
# #
# $syslog_type:
# Syslog type to use. Valid values are syslogd and rsyslog.
# Default depends on operating system.
#
# $syslog_datadir: # $syslog_datadir:
# Directory where to store logs. Defaults to /srv/log. # Directory where to store logs. Defaults to /srv/log.
# #
# $syslog_group: class syslog::common::standalone inherits syslog::common {
# Group name which has permissions to read logs. Defaults to
# wheel or root depending on operating system.
#
class syslog::standalone::common {
if !$syslog_type {
case $operatingsystem {
"centos": {
$syslog_type = $operatingsystemrelease ? {
/^6/ => "rsyslog",
default => "syslogd",
}
}
"fedora": { $syslog_type = "rsyslog" }
"openbsd": { $syslog_type = "syslogd" }
"ubuntu": { $syslog_type = "rsyslog" }
}
}
if $syslog_group {
$group = $syslog_group
} else {
if $operatingsystem == "OpenBSD" {
$group = "wheel"
} else {
$group = "root"
}
}
if $syslog_datadir { if $syslog_datadir {
file { $syslog_datadir: file { $syslog_datadir:
@ -240,7 +229,7 @@ class syslog::standalone::common {
# Install standalone syslog host. # Install standalone syslog host.
# #
class syslog::standalone inherits syslog::standalone::common { class syslog::standalone inherits syslog::common::standalone {
case $syslog_type { case $syslog_type {
"syslogd": { include syslog::standalone::syslogd } "syslogd": { include syslog::standalone::syslogd }
@ -282,7 +271,7 @@ class syslog::standalone::rsyslog inherits syslog::client::rsyslog {
# Install syslog server. # Install syslog server.
# #
class syslog::server inherits syslog::standalone::common { class syslog::server inherits syslog::common::standalone {
case $syslog_type { case $syslog_type {
"syslogd": { fail("Server for \$syslog_type '$syslog_type' not yet supported.") } "syslogd": { fail("Server for \$syslog_type '$syslog_type' not yet supported.") }