rpms/rsyslog/devel rsyslog.conf,1.1,1.2 rsyslog.spec,1.45,1.46

[Peter Vrabec (pvrabec)]

Author: pvrabec

Update of /cvs/extras/rpms/rsyslog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9390

Modified Files:
	rsyslog.conf rsyslog.spec 
Log Message:
djust default config file



Index: rsyslog.conf
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rsyslog.conf	11 Jul 2008 11:37:05 -0000	1.1
+++ rsyslog.conf	14 Jul 2008 12:41:31 -0000	1.2
@@ -1,23 +1,7 @@
 #rsyslog v3 config file
 
-
-#### GLOBAL DIRECTIVES ####
-
-# Use default timestamp format
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# File syncing capability is disabled by default. This feature is usually not required, 
-# not useful and an extreme performance hit
-#$ActionFileEnableSync on
-
-# An "In-Memory Queue" is created for remote logging.
-# $WorkDirectory /var/spool/rsyslog       # where to place spool files
-# $ActionQueueFileName queue              # 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      # infinety retries if host is down
-
+# if you experience problems, check
+# http://www.rsyslog.com/troubleshoot for assistance
 
 #### MODULES ####
 
@@ -34,6 +18,16 @@
 #$InputTCPServerRun 514
 
 
+#### GLOBAL DIRECTIVES ####
+
+# Use default timestamp format
+$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
+
+# File syncing capability is disabled by default. This feature is usually not required, 
+# not useful and an extreme performance hit
+#$ActionFileEnableSync on
+
+
 #### RULES ####
 
 # Log all kernel messages to the console.
@@ -63,3 +57,22 @@
 # Save boot messages also to boot.log
 local7.*                                                /var/log/boot.log
 
+
+
+# ### 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
+# ### end of the forwarding rule ###


Index: rsyslog.spec
===================================================================
RCS file: /cvs/extras/rpms/rsyslog/devel/rsyslog.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- rsyslog.spec	11 Jul 2008 11:37:05 -0000	1.45
+++ rsyslog.spec	14 Jul 2008 12:41:31 -0000	1.46
@@ -3,7 +3,7 @@
 Summary: Enhanced system logging and kernel message trapping daemons
 Name: rsyslog
 Version: 3.19.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -191,6 +191,9 @@
 %{_libdir}/rsyslog/lmnsd_gtls.so
 
 %changelog
+* Mon Jul 14 2008 Peter Vrabec <pvrabec at redhat.com> 3.19.9-2
+- adjust default config file
+
 * Fri Jul 11 2008 Lubomir Rintel <lkundrak at v3.sk> 3.19.9-1
 - upgrade