From 53c02f4d14491c3a5409cb5efc73e4af79187608 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Sun, 12 Aug 2012 18:05:20 +0300
Subject: [PATCH] Added disk queue for rsyslog client

---
 syslog/manifests/init.pp                | 39 ++++++++++++++++---------
 syslog/templates/syslog.conf.client.erb |  7 +++++
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/syslog/manifests/init.pp b/syslog/manifests/init.pp
index 36c8331..ac62da3 100644
--- a/syslog/manifests/init.pp
+++ b/syslog/manifests/init.pp
@@ -13,9 +13,9 @@
 class syslog::common {
 
     if !$syslog_type {
-        case $operatingsystem {
+        case $::operatingsystem {
             "centos": {
-                $syslog_type = $operatingsystemrelease ? {
+                $syslog_type = $::operatingsystemrelease ? {
                     /^6/    => "rsyslog",
                     default => "syslogd",
                 }
@@ -29,7 +29,7 @@ class syslog::common {
     if $syslog_group {
         $group = $syslog_group
     } else {
-        if $operatingsystem == "OpenBSD" {
+        if $::operatingsystem == "OpenBSD" {
             $group = "wheel"
         } else {
             $group = "root"
@@ -89,7 +89,7 @@ class syslog::client inherits syslog::common {
 #
 class syslog::client::syslogd {
 
-    if $operatingsystem != "OpenBSD" {
+    if $::operatingsystem != "OpenBSD" {
         package { "syslogd":
             ensure => installed,
             name   => "sysklogd",
@@ -103,7 +103,7 @@ class syslog::client::syslogd {
                             "syslog/syslog.conf.client.erb"),
         mode    => "0644",
         owner   => "root",
-        group   => $operatingsystem ? {
+        group   => $::operatingsystem ? {
             "openbsd" => "wheel",
             default   => "root",
         },
@@ -111,17 +111,17 @@ class syslog::client::syslogd {
     }
 
     service { "syslogd":
-        name    => $operatingsystem ? {
+        name    => $::operatingsystem ? {
             "openbsd" => "syslogd",
             default   => "syslog",
         },
         ensure  => running,
         enable  => true,
-        start   => $operatingsystem ? {
+        start   => $::operatingsystem ? {
             "openbsd" => "syslogd -a /var/www/dev/log -a /var/named/dev/log -a /var/empty/dev/log",
             default   => undef,
         },
-        restart => $operatingsystem ? {
+        restart => $::operatingsystem ? {
             "openbsd" => "pkill -HUP -u _syslogd",
             default   => undef,
         },
@@ -139,7 +139,7 @@ class syslog::client::rsyslog {
         ensure => installed,
     }
 
-    if $operatingsystem != "OpenBSD" and $syslog_tlsserver {
+    if $::operatingsystem != "OpenBSD" and $syslog_tlsserver {
         package { "rsyslog-gnutls":
             ensure => installed,
             before => Service["rsyslog"],
@@ -153,7 +153,7 @@ class syslog::client::rsyslog {
                             "syslog/syslog.conf.client.erb"),
         mode    => "0644",
         owner   => "root",
-        group   => $operatingsystem ? {
+        group   => $::operatingsystem ? {
             "openbsd" => "wheel",
             default   => "root",
         },
@@ -161,11 +161,22 @@ class syslog::client::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":
         ensure  => running,
         enable  => true,
-        start   => $operatingsystem ? {
-            "openbsd" => $operatingsystemrelease ? {
+        start   => $::operatingsystem ? {
+            "openbsd" => $::operatingsystemrelease ? {
                 /4\.[1-8]/ => "pkill syslogd; /usr/local/sbin/rsyslogd -c 4 -x -i /var/run/syslog.pid",
                 default    => undef,
             },
@@ -174,7 +185,7 @@ class syslog::client::rsyslog {
         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":
             ensure => present,
             mode   => "0555",
@@ -259,7 +270,7 @@ class syslog::common::standalone inherits syslog::common {
         source => "puppet:///modules/syslog/logarchiver.sh",
         mode   => "0755",
         owner  => "root",
-        group  => $operatingsystem ? {
+        group  => $::operatingsystem ? {
             "openbsd" => "wheel",
             default   => "root",
         },
diff --git a/syslog/templates/syslog.conf.client.erb b/syslog/templates/syslog.conf.client.erb
index 802dbf3..f230e58 100644
--- a/syslog/templates/syslog.conf.client.erb
+++ b/syslog/templates/syslog.conf.client.erb
@@ -12,6 +12,13 @@ $ActionSendStreamDriverMode 1
 $ActionSendStreamDriverAuthMode x509/name
 $ActionSendStreamDriverPermittedPeer <%= syslog_tlsserver %>
 
+$WorkDirectory /var/spool/rsyslog
+$ActionQueueFileName <%= syslog_tlsserver %>
+$ActionQueueMaxDiskSpace 100M
+$ActionQueueSaveOnShutdown on
+$ActionQueueType LinkedList
+$ActionResumeRetryCount -1
+
 *.*		@@<%= syslog_tlsserver %>
 mark.*		@@<%= syslog_tlsserver %>
 <% elsif has_variable?('syslog_server') -%>