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

Added disk queue for rsyslog client

Browse source
This commit is contained in:
Ossi Salmi 2012-08-12 18:05:20 +03:00
parent e38b399be0
commit 53c02f4d14
2 changed files with 32 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
syslog/manifests/init.pp
View file

@ -13,9 +13,9 @@
class syslog::common { class syslog::common {
if !$syslog_type { if !$syslog_type {
case $operatingsystem { case $::operatingsystem {
"centos": { "centos": {
$syslog_type = $operatingsystemrelease ? { $syslog_type = $::operatingsystemrelease ? {
/^6/ => "rsyslog", /^6/ => "rsyslog",
default => "syslogd", default => "syslogd",
} }
@ -29,7 +29,7 @@ class syslog::common {
if $syslog_group { if $syslog_group {
$group = $syslog_group $group = $syslog_group
} else { } else {
if $operatingsystem == "OpenBSD" { if $::operatingsystem == "OpenBSD" {
$group = "wheel" $group = "wheel"
} else { } else {
$group = "root" $group = "root"
@ -89,7 +89,7 @@ class syslog::client inherits syslog::common {
# #
class syslog::client::syslogd { class syslog::client::syslogd {
if $operatingsystem != "OpenBSD" { if $::operatingsystem != "OpenBSD" {
package { "syslogd": package { "syslogd":
ensure => installed, ensure => installed,
name => "sysklogd", name => "sysklogd",
@ -103,7 +103,7 @@ class syslog::client::syslogd {
"syslog/syslog.conf.client.erb"), "syslog/syslog.conf.client.erb"),
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => $operatingsystem ? { group => $::operatingsystem ? {
"openbsd" => "wheel", "openbsd" => "wheel",
default => "root", default => "root",
}, },
@ -111,17 +111,17 @@ class syslog::client::syslogd {
} }
service { "syslogd": service { "syslogd":
name => $operatingsystem ? { name => $::operatingsystem ? {
"openbsd" => "syslogd", "openbsd" => "syslogd",
default => "syslog", default => "syslog",
}, },
ensure => running, ensure => running,
enable => true, enable => true,
start => $operatingsystem ? { start => $::operatingsystem ? {
"openbsd" => "syslogd -a /var/www/dev/log -a /var/named/dev/log -a /var/empty/dev/log", "openbsd" => "syslogd -a /var/www/dev/log -a /var/named/dev/log -a /var/empty/dev/log",
default => undef, default => undef,
}, },
restart => $operatingsystem ? { restart => $::operatingsystem ? {
"openbsd" => "pkill -HUP -u _syslogd", "openbsd" => "pkill -HUP -u _syslogd",
default => undef, default => undef,
}, },
@ -139,7 +139,7 @@ class syslog::client::rsyslog {
ensure => installed, ensure => installed,
} }
if $operatingsystem != "OpenBSD" and $syslog_tlsserver { if $::operatingsystem != "OpenBSD" and $syslog_tlsserver {
package { "rsyslog-gnutls": package { "rsyslog-gnutls":
ensure => installed, ensure => installed,
before => Service["rsyslog"], before => Service["rsyslog"],
@ -153,7 +153,7 @@ class syslog::client::rsyslog {
"syslog/syslog.conf.client.erb"), "syslog/syslog.conf.client.erb"),
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => $operatingsystem ? { group => $::operatingsystem ? {
"openbsd" => "wheel", "openbsd" => "wheel",
default => "root", default => "root",
}, },
@ -161,11 +161,22 @@ class syslog::client::rsyslog {
notify => Service["rsyslog"], notify => Service["rsyslog"],
} }
file { "/var/spool/rsyslog":
ensure => directory,
mode => "0700",
owner => "root",
group => $::operatingsystem ? {
"openbsd" => "wheel",
default => "root",
},
before => Service["rsyslog"],
}
service { "rsyslog": service { "rsyslog":
ensure => running, ensure => running,
enable => true, enable => true,
start => $operatingsystem ? { start => $::operatingsystem ? {
"openbsd" => $operatingsystemrelease ? { "openbsd" => $::operatingsystemrelease ? {
/4\.[1-8]/ => "pkill syslogd; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid", /4\.[1-8]/ => "pkill syslogd; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid",
default => undef, default => undef,
}, },
@ -174,7 +185,7 @@ class syslog::client::rsyslog {
require => File["/var/log/all.log"], require => File["/var/log/all.log"],
} }
if $operatingsystem == "OpenBSD" and $operatingsystemrelease !~ /4\.[1-8]/ { if $::operatingsystem == "OpenBSD" and $::operatingsystemrelease !~ /4\.[1-8]/ {
file { "/etc/rc.d/syslogd": file { "/etc/rc.d/syslogd":
ensure => present, ensure => present,
mode => "0555", mode => "0555",
@ -259,7 +270,7 @@ class syslog::common::standalone inherits syslog::common {
source => "puppet:///modules/syslog/logarchiver.sh", source => "puppet:///modules/syslog/logarchiver.sh",
mode => "0755", mode => "0755",
owner => "root", owner => "root",
group => $operatingsystem ? { group => $::operatingsystem ? {
"openbsd" => "wheel", "openbsd" => "wheel",
default => "root", default => "root",
}, },

7
syslog/templates/syslog.conf.client.erb
View file

@ -12,6 +12,13 @@ $ActionSendStreamDriverMode 1
$ActionSendStreamDriverAuthMode x509/name $ActionSendStreamDriverAuthMode x509/name
$ActionSendStreamDriverPermittedPeer <%= syslog_tlsserver %> $ActionSendStreamDriverPermittedPeer <%= syslog_tlsserver %>
$WorkDirectory /var/spool/rsyslog
$ActionQueueFileName <%= syslog_tlsserver %>
$ActionQueueMaxDiskSpace 100M
$ActionQueueSaveOnShutdown on
$ActionQueueType LinkedList
$ActionResumeRetryCount -1
*.* @@<%= syslog_tlsserver %> *.* @@<%= syslog_tlsserver %>
mark.* @@<%= syslog_tlsserver %> mark.* @@<%= syslog_tlsserver %>
<% elsif has_variable?('syslog_server') -%> <% elsif has_variable?('syslog_server') -%>