From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Tue, 5 May 2009 14:08:52 +0000 (+0200)
Subject: Merge commit 'origin/template' into log
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=18389d5c0a1128f195ac315d8cd6eacbe800961f;hp=1f22be2e6677e29ca4c4a3b7d596cc86ce46fd0f;p=matthijs%2Fservers%2Fdrsnuggles.git

Merge commit 'origin/template' into log

* commit 'origin/template':
  rsyslog: Make the main queue disk-assisted as well.

* commits left out:
  rsyslog: Enable queuing of log messages.
---

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 1fb94a7..b6ce47b 100644
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -32,6 +32,18 @@ $FileGroup adm
 $FileCreateMode 0640
 $DirCreateMode 0755
 
+# Store any queues here. This directory is not created automatically, so it
+# must already exist!
+$WorkDirectory /var/spool/rsyslog
+
+# Use a (disk-assisted) main queue
+# Use a linked list for queueing
+$MainMsgQueueType LinkedList
+# Name to use for the queue file
+$MainMsgQueueFileName main
+# save in-memory data if rsyslog shuts down
+$MainMsgQueueSaveOnShutdown on
+
 #
 # Include all config files in /etc/rsyslog.d/
 #
@@ -100,4 +112,3 @@ local0,local1,local2,\
 # Emergencies are sent to everybody logged in.
 #
 *.emerg				*
-