diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:21:00 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-09-04 15:21:00 +0200 |
| commit | c2b7c3c1836f7549af40524de15f4a98061414ff (patch) | |
| tree | 49567fa6555f716b39689902b546550d859baa30 | |
| parent | 44083dda02f004df3e3552eb00a145fe6e0733af (diff) | |
| parent | 5cce834d7ac9bdfdd122bd57630f0283c2fe0a0b (diff) | |
| download | rsyslog-c2b7c3c1836f7549af40524de15f4a98061414ff.tar.gz rsyslog-c2b7c3c1836f7549af40524de15f4a98061414ff.tar.xz rsyslog-c2b7c3c1836f7549af40524de15f4a98061414ff.zip | |
Merge branch 'v4-beta' into beta
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | doc/rsyslog_conf_global.html | 11 |
2 files changed, 9 insertions, 4 deletions
@@ -457,6 +457,8 @@ version before switching to this one. --------------------------------------------------------------------------- Version 3.22.2 [v3-stable] (rgerhards), 2009-07-?? - bugfix: sending syslog messages with zip compression did not work +- clarified use of $ActionsSendStreamDriver[AuthMode/PermittedPeers] + in doc set (require TLS drivers) --------------------------------------------------------------------------- Version 3.22.1 [v3-stable] (rgerhards), 2009-07-02 - bugfix: invalid error message issued if $inlcudeConfig was on an empty diff --git a/doc/rsyslog_conf_global.html b/doc/rsyslog_conf_global.html index fa9c7eef..45eeabe6 100644 --- a/doc/rsyslog_conf_global.html +++ b/doc/rsyslog_conf_global.html @@ -92,10 +92,13 @@ default 60000 (1 minute)]</li> <li><a href="rsconf1_actionresumeinterval.html">$ActionResumeInterval</a></li> <li>$ActionResumeRetryCount <number> [default 0, -1 means eternal]</li> <li>$ActionSendResendLastMsgOnReconn <[on/<b>off</b>]> specifies if the last message is to be resend when a connecition broken and has been reconnedcted. May increase reliability, but comes at the risk of message duplication. -<li>$ActionSendStreamDriver <driver basename> just like $DefaultNetstreamDriver, but for the specific action -</li><li>$ActionSendStreamDriverMode <mode>, default 0, mode to use with the stream driver -(driver-specific)</li><li>$ActionSendStreamDriverAuthMode <mode>, authentication mode to use with the stream driver -(driver-specific)</li><li>$ActionSendStreamDriverPermittedPeer <ID>, accepted fingerprint (SHA1) or name of remote peer +<li>$ActionSendStreamDriver <driver basename> just like $DefaultNetstreamDriver, but for the specific action</li> +<li>$ActionSendStreamDriverMode <mode>, default 0, mode to use with the stream driver (driver-specific)</li> +<li>$ActionSendStreamDriverAuthMode <mode>, authentication mode to use with the stream driver. Note that this directive requires TLS +netstream drivers. For all others, it will be ignored. +(driver-specific)</li> +<li>$ActionSendStreamDriverPermittedPeer <ID>, accepted fingerprint (SHA1) or name of remote peer. Note that this directive requires TLS +netstream drivers. For all others, it will be ignored. (driver-specific) -<span style="font-weight: bold;"> directive may go away</span>!</li> <li><b>$ActionSendTCPRebindInterval</b> nbr</a>- [available since 4.5.1] - instructs the TCP send action to close and re-open the connection to the remote host every nbr of messages sent. |