rsyslog: Don't use a template when it's not needed.

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

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 1fb94a79503bd0f7baffa30f74adba2170dbe213..d3cda8fc1753048dc902911d42c94c653cd5898b 100644 (file)
--- 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/
 #
@@ -45,7 +57,6 @@ $IncludeConfig /etc/rsyslog.d/*.conf
 $template FacilityLog,"/data/log/rsyslog/%hostname%/facilities/%syslogfacility-text%.log"
 $template SeverityLog,"/data/log/rsyslog/%hostname%/severities/%syslogseverity-text%.log"
 $template AppLog,"/data/log/rsyslog/%hostname%/apps/%app-name%.log"
-$template AllLog,"/data/log/rsyslog/all.log"
 
 # Use a verbose logging format
 $template LogFormat, "%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag% %syslogfacility-text%.%syslogseverity-text%%msg:::sp-if-no-1st-sp%%msg:::drop-last-lf%\n"
@@ -56,7 +67,7 @@ $template LogFormat, "%TIMESTAMP:::date-rfc3339% %HOSTNAME% %syslogtag% %syslogf
 *.*                            ?AppLog;LogFormat
 # Log all entries in a single file, which is meant to be parsed by logcheck
 # (hence the traditional format).
-*.*                            ?AllLog;RSYSLOG_TraditionalFileFormat
+*.*                            -/data/log/rsyslog/all.log;RSYSLOG_TraditionalFileFormat
 
 #######################
 #### Local logging ####
@@ -100,4 +111,3 @@ local0,local1,local2,\
 # Emergencies are sent to everybody logged in.
 #
 *.emerg                                *
-