rsyslog: Make the main queue disk-assisted as well.

[matthijs/servers/drsnuggles.git] / etc / rsyslog.conf

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 294272a5b5b3c415fdde8472ff5eb88014cdfaa1..c6e706be16f977a902719e8b94f3c67036c3685c 100644 (file)
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -9,7 +9,6 @@
 #################
 
 $ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd) 
 $ModLoad immark   # provides --MARK-- message capability
 $MarkMessagePeriod  900 # mark messages appear every 15 Minutes
 
@@ -36,23 +35,34 @@ $DirCreateMode 0755
 #
 $IncludeConfig /etc/rsyslog.d/*.conf
 
+# Store any queues here. This directory is not created automatically, so it
+# must already exist!
+$WorkDirectory /var/spool/rsyslog
 
-###############
-#### RULES ####
-###############
+# 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
+
+#######################
+#### Local logging ####
+#######################
 
 #
 # Log each facility into its own log
-auth,authpriv.*                        /var/log/auth.log
-cron.*                         -/var/log/user.log
-daemon.*                       -/var/log/daemon.log
-kern.*                         -/var/log/kern.log
-lpr.*                          -/var/log/lpr.log
-mail.*                         -/var/log/mail.log
-user.*                         -/var/log/user.log
+auth,authpriv.*                        /var/log/rsyslog/auth.log
+cron.*                         -/var/log/rsyslog/user.log
+daemon.*                       -/var/log/rsyslog/daemon.log
+kern.*                         -/var/log/rsyslog/kern.log
+lpr.*                          -/var/log/rsyslog/lpr.log
+mail.*                         -/var/log/rsyslog/mail.log
+user.*                         -/var/log/rsyslog/user.log
 local0,local1,local2,\
        local3,local4,local5,\
-       local6,local7.*         -/var/log/local.log
+       local6,local7.*         -/var/log/rsyslog/local.log
 
 # Omitted facilities: syslog, news, uucp, ftp
 
@@ -63,15 +73,31 @@ local0,local1,local2,\
 *.*;\
        *.!=debug;\
        auth,authpriv.none;\
-       mail.none               -/var/log/syslog
+       mail.none               -/var/log/rsyslog/syslog
 
 # Debug entries end up in debug.log as well as the corresponding facility log
 # above (except for auth and mail, which only end up in the facility logs for
 # privacy reasons).
 *.=debug;\
        auth,authpriv.none;\
-       news.none;mail.none     -/var/log/debug.log
+       news.none;mail.none     -/var/log/rsyslog/debug.log
 #
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                                *
+
+########################
+#### Remote logging ####
+########################
+
+# Send all log entries to the log vserver, but queue them in memory as well as
+# on disk if needed.
+# Use a linked list for queueing
+$ActionQueueType LinkedList
+# Name to use for the queue file
+$ActionQueueFileName remote
+# infinite retries on insert failure
+$ActionResumeRetryCount -1
+# save in-memory data if rsyslog shuts down
+$ActionQueueSaveOnShutdown on
+*.*                            @@log;RSYSLOG_SyslogProtocol23Format