- moved from rsyslog5.spec. 5.x.x branch is in devel, we should keep it in cvs branch

Changed files:
    rsyslog.conf -> 1.2.4.1

diff --git a/rsyslog.conf b/rsyslog.conf
index b572ac64f9e7b4e39442762506e9149a8b50524c..fe3c4c99df1adb0884afb088a94b1da1c46e4f0e 100644 (file)
--- a/rsyslog.conf
+++ b/rsyslog.conf
@@ -1,119 +1,41 @@
-#rsyslog v4 config file
-
-# if you experience problems, check
-# http://www.rsyslog.com/troubleshoot for assistance
-
-#### MODULES ####
-
-$ModLoad imuxsock.so   # provides support for local system logging (e.g. via logger command)
-$ModLoad imklog.so     # provides kernel logging support (previously done by rklogd)
-#$ModLoad immark.so    # provides --MARK-- message capability
-
-# Provides UDP syslog reception
-#$ModLoad imudp.so
-#$UDPServerRun 514
-
-# Provides TCP syslog reception
+#rsyslog v3 config file
+
+# provides support for local system logging (e.g. via logger command)
+$ModLoad imuxsock.so 
+# provides kernel logging support (previously done by rklogd)
+$ModLoad imklog.so
+
+# provides --MARK-- message capability
+#$ModLoad immark.so  
+# provides UDP syslog reception
+#$ModLoad imudp.so  
+# provides TCP syslog reception and GSS-API (if compiled to support it)
 #$ModLoad imtcp.so  
-#$InputTCPServerRun 514
-
 
-# ### GLOBAL DIRECTIVES ####
-
-#
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# File syncing capability is disabled by default. This feature is usually not required, 
-# not useful and an extreme performance hit.
-# Without that dash doesn't work.
-#$ActionFileEnableSync on
-
-#
-# Set the default permissions for all log files.
-#
-$FileOwner root
-$FileGroup logs
-$FileCreateMode 0640
-$DirCreateMode 0750
-
-
-# ### RULES ####
 
 # Log all kernel messages to the console.
 # Logging much else clutters up the screen.
-#kern.*                                                        /dev/console
+#kern.*                                                 /dev/console
+
+# Log anything (except mail) of level info or higher.
+# Don't log private authentication messages!
+*.info;mail.none;authpriv.none;cron.none                /var/log/messages
 
 # The authpriv file has restricted access.
-authpriv.*                                             /var/log/secure
+authpriv.*                                              /var/log/secure
 
 # Log all the mail messages in one place.
-mail.*                                                 -/var/log/maillog
+mail.*                                                  -/var/log/maillog
+
 
 # Log cron stuff
-cron.*                                                 /var/log/cron
+cron.*                                                  /var/log/cron
 
 # Everybody gets emergency messages
-*.emerg                                                        *
+*.emerg                                                 *
 
 # Save news errors of level crit and higher in a special file.
-uucp,news.crit                                         /var/log/spooler
+uucp,news.crit                                          /var/log/spooler
 
 # Save boot messages also to boot.log
-local7.*                                               /var/log/boot.log
-
-#
-# Some "catch-all" log files.
-#
-*.=debug;\
-       auth,authpriv.none;\
-       news.none;mail.none                             -/var/log/debug
-*.=info;*.=notice;*.=warn;\
-       auth,authpriv.none;\
-       cron,daemon.none;\
-       mail,news.none                                  -/var/log/messages
-
-# ### Additional - from wiki ###
-# A basic template mostly from the docs, but I wanted to know what system forwarded the                                                                               
-# messages so I added some text. Also I added the ":::space" to handle the windows                                                                                    
-# events (based on the other suggestions in the wiki)                                                                                                                 
-#                                                                                                                                                                     
-# $template SyslFormat,"%timegenerated% [WJCG]-%HOSTNAME% %syslogtag%%msg:::space$
-
-# this is for Windows events from SNARE                                                                                                                               
-#                                                                                                                                                                     
-# $EscapeControlCharactersOnReceive off
-
-# ### misc
-#
-# reduce any duplicates                                                                                                                                               
-#                                                                                                                                                                     
-# $RepeatedMsgReduction on
-# $OptimizeForUniprocessor on
-
-
-
-# ### Begin forwarding rule ###
-# The statement between the begin ... end define a SINGLE forwarding
-# rule. They belong together, do NOT split them. If you create multiple
-# forwarding rules, duplicate the whole block!
-# Remote Logging (we use TCP for reliable delivery)
-#
-# An on-disk queue is created for this action. If the remote host is
-# down, messages are spooled to disk and sent when it is up again.
-#$WorkDirectory /var/spppl/rsyslog # where to place spool files
-#$ActionQueueFileName fwdRule1 # unique name prefix for spool files
-#$ActionQueueMaxDiskSpace 1g   # 1gb space limit (use as much as possible)
-#$ActionQueueSaveOnShutdown on # save messages to disk on shutdown
-#$ActionQueueType LinkedList   # run asynchronously
-#$ActionResumeRetryCount -1    # infinite retries if host is down
-# remote host is: name/ip:port, e.g. 192.168.0.1:514, port optional
-#*.* @@remote-host:514
-
-
-
-# ### For central logs server use an example: host/year/month/day/facility ###
-#
-#$template DailyPerHostLogs,"/var/log/remote/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/%syslogfacility-text%"                                                                #*.* -?DailyPerHostLogs
-
+local7.*                                                /var/log/boot.log