diff -upb rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html.manPage rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html
--- rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html.manPage 2008-02-07 11:50:17.000000000 +0100
+++ rsyslog-2.0.0/doc/rsconf1_actionexeconlywhenpreviousissuspended.html 2008-02-07 11:52:13.000000000 +0100
@@ -0,0 +1,29 @@
+
+
+rsyslog.conf file
+
+
+$ActionExecOnlyWhenPreviousIsSuspended
+Type: global configuration directive
+Default: off
+Description:
+This directive allows to specify if actions should always be executed ("off," the default) or only if the previous action is suspended ("on"). This directive works hand-in-hand with the multiple actions per selector feature. It can be used, for example, to create rules that automatically switch destination servers or databases to a (set of) backup(s), if the primary server fails. Note that this feature depends on proper implementation of the suspend feature in the output module. All built-in output modules properly support it (most importantly the database write and the syslog message forwarder).
+This selector processes all messages it receives (*.*). It tries to forward every message to primary-syslog.example.com (via tcp). If it can not reach that server, it tries secondary-1-syslog.example.com, if that fails too, it tries secondary-2-syslog.example.com. If neither of these servers can be connected, the data is stored in /var/log/localbuffer. Please note that the secondaries and the local log buffer are only used if the one before them does not work. So ideally, /var/log/localbuffer will never receive a message. If one of the servers resumes operation, it automatically takes over processing again.
+We strongly advise not to use repeated line reduction together with ActionExecOnlyWhenPreviousIsSuspended. It may lead to "interesting" and undesired results (but you can try it if you like).
+Sample:
+*.* @@primary-syslog.example.com
+
$ActionExecOnlyWhenPreviousIsSuspended on
+
& @@secondary-1-syslog.example.com # & is used to have more than one action for
+
& @@secondary-2-syslog.example.com # the same selector - the mult-action feature
+
& /var/log/localbuffer
+
$ActionExecOnlyWhenPreviousIsSuspended off # to re-set it for the next selector
+
+[rsyslog.conf overview] [manual
+index] [rsyslog site]
+This documentation is part of the
+rsyslog project.
+Copyright © 2007 by Rainer Gerhards and
+Adiscon. Released under the GNU GPL
+version 2 or higher.
+
+
diff -upb rsyslog-2.0.0/doc/rsyslog_conf.html.manPage rsyslog-2.0.0/doc/rsyslog_conf.html
--- rsyslog-2.0.0/doc/rsyslog_conf.html.manPage 2008-02-07 11:45:32.000000000 +0100
+++ rsyslog-2.0.0/doc/rsyslog_conf.html 2008-02-07 13:38:22.000000000 +0100
@@ -25,7 +25,7 @@ to rsyslogd.
start with a dollar-sign. Here is a list in alphabetical order. Follow links for
a description.
- - $ActionExecOnlyIfPreviousIsSuspended
+ - $ActionExecOnlyWhenPreviousIsSuspended
- $ActionResumeInterval
- $AllowedSender
- $ControlCharacterEscapePrefix
@@ -43,9 +43,6 @@ a description.
- $FileCreateMode
- $FileGroup
- $FileOwner
- - $GssForwardServiceName
- - $GssListenServiceName
- - $GssMode
- $IncludeConfig
- $MainMsgQueueSize
- $ModDir
diff -upb rsyslog-2.0.0/rsyslogd.8.manPage rsyslog-2.0.0/rsyslogd.8
--- rsyslog-2.0.0/rsyslogd.8.manPage 2008-02-07 11:35:22.000000000 +0100
+++ rsyslog-2.0.0/rsyslogd.8 2008-02-07 13:38:00.000000000 +0100
@@ -18,9 +18,6 @@ rsyslogd \- reliable and extended syslog
.RB [ " \-f "
.I config file
]
-.RB [ " \-g "
-.I port,max-nbr-of-sessions
-]
.RB [ " \-h " ]
.br
.RB [ " \-i "
@@ -158,12 +155,6 @@ Specify an alternative configuration fil
.IR /etc/rsyslog.conf ","
which is the default.
.TP
-.BI "\-g "
-Identical to -t except that every tcp connection is authenticated
-using gss-api (kerberos 5). Service name may be set using
-$GssListenServiceName or the default "host" will be used. Encryption
-can be used if specified by the client and supported by both sides.
-.TP
.BI "\-h "
By default rsyslogd will not forward messages it receives from remote hosts.
Specifying this switch on the command line will cause the log daemon to
@@ -276,15 +267,10 @@ will be reread and the
.BR rsyslog (3)
facility is started again.
.TP
-.B SIGTERM
+.B SIGTERM "," SIGINT "," SIGQUIT
.B Rsyslogd
will die.
.TP
-.BR SIGINT ", " SIGQUIT
-If debugging is enabled these are ignored, otherwise
-.B rsyslogd
-will die.
-.TP
.B SIGUSR1
Switch debugging on/off. This option can only be used if
.B rsyslogd
@@ -501,8 +487,7 @@ If remote logging is enabled, messages c
As the messages are transmitted in clear-text, an attacker might use
the information obtained from the packets for malicious things. Also, an
attacker might reply recorded messages or spoof a sender's IP address,
-which could lead to a wrong perception of system activity. These can
-be prevented by using GSS-API authentication and encryption. Be sure
+which could lead to a wrong perception of system activity. Be sure
to think about syslog network security before enabling it.
.LP
.SH DEBUGGING