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 --cc etc/rsyslog.conf
index 1fb94a79503bd0f7baffa30f74adba2170dbe213,c6e706be16f977a902719e8b94f3c67036c3685c..b6ce47bec4c1c77985ed57b2b81334d7a657dca6
--- 1/etc/rsyslog.conf
--- 2/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@@ -32,32 -30,23 +32,44 @@@ $FileGroup ad
  $FileCreateMode 0640
  $DirCreateMode 0755
  
 -#
 -# Include all config files in /etc/rsyslog.d/
 -#
 -$IncludeConfig /etc/rsyslog.d/*.conf
 -
+ # 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/
 +#
 +$IncludeConfig /etc/rsyslog.d/*.conf
 +
 +########################
 +#### Remote logging ####
 +########################
 +
 +# Log lines received from other servers (as well as our own logs) centrally.
 +$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"
 +
 +# Log by facility, severity and appname
 +*.*                           ?FacilityLog;LogFormat
 +*.*                           ?SeverityLog;LogFormat
 +*.*                           ?AppLog;LogFormat
 +# Log all entries in a single file, which is meant to be parsed by logcheck
 +# (hence the traditional format).
 +*.*                           ?AllLog;RSYSLOG_TraditionalFileFormat
 +
  #######################
  #### Local logging ####
  #######################
@@@ -100,4 -85,19 +112,3 @@@ local0,local1,local2,
  # 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