X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=etc%2Frsyslog.conf;h=ab6876b8b1228eadb758bc402c72a37d9880cb34;hb=a799b50b1d46b49b57ce3212c2fcf60317e7a6f9;hp=3d61e26a0d54d8859ada3bf19614760c97d72ea2;hpb=83b9e50f5c8879f979531db6a9ea3d0059027aac;p=matthijs%2Fservers%2Fdrsnuggles.git

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 3d61e26..ab6876b 100644
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -9,9 +9,8 @@
 #################
 
 $ModLoad imuxsock # provides support for local system logging
-$ModLoad imklog   # provides kernel logging support (previously done by rklogd) 
-#$ModLoad immark   # provides --MARK-- message capability
-
+$ModLoad immark   # provides --MARK-- message capability
+$MarkMessagePeriod  900 # mark messages appear every 15 Minutes
 
 ###########################
 #### GLOBAL DIRECTIVES ####
@@ -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
+
+# 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
 
-###############
-#### RULES ####
-###############
+#######################
+#### 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_ForwardFormat