git: Make git-wrapper create links with -f.

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

diff --git a/etc/rsyslog.conf b/etc/rsyslog.conf
index 262d102b15b8107721e93a50d4a909dca31b95a1..ab6876b8b1228eadb758bc402c72a37d9880cb34 100644 (file)
--- a/etc/rsyslog.conf
+++ b/etc/rsyslog.conf
@@ -35,10 +35,21 @@ $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
@@ -74,3 +85,19 @@ 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_ForwardFormat