summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2005-10-19 14:55:03 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2005-10-19 14:55:03 +0000
commit95495732701803b8c25d4d324b975d7b88f1432d (patch)
tree97072672c6758e81739e394f09d2e833d992848c /doc
parent42017aa38855678653baeb1cf88b87564abe0c27 (diff)
downloadrsyslog-95495732701803b8c25d4d324b975d7b88f1432d.tar.gz
rsyslog-95495732701803b8c25d4d324b975d7b88f1432d.tar.xz
rsyslog-95495732701803b8c25d4d324b975d7b88f1432d.zip
doc updates for 1.11.1
Diffstat (limited to 'doc')
-rw-r--r--doc/features.html2
-rw-r--r--doc/rsyslog_conf.html21
-rw-r--r--doc/status.html6
3 files changed, 25 insertions, 4 deletions
diff --git a/doc/features.html b/doc/features.html
index 6f7f6af7..2445826f 100644
--- a/doc/features.html
+++ b/doc/features.html
@@ -26,7 +26,7 @@ is going on, you can also subscribe to the <a href="http://lists.adiscon.net/mai
messages<li>control of whether the local hostname or the hostname of the
origin of the data is shown as the hostname in the output<li>ability to
preserve the original hostname in NAT environments and relay chains
- <li>ability to limit the allowed network senders</ul>
+ <li>ability to limit the allowed network senders<li>powerful BSD-style hostname and program name blocks for easy multi-host support</ul>
<h2>Upcoming Features</h2>
<ul>
<li>support for
diff --git a/doc/rsyslog_conf.html b/doc/rsyslog_conf.html
index 38a0ab80..726ffa02 100644
--- a/doc/rsyslog_conf.html
+++ b/doc/rsyslog_conf.html
@@ -205,6 +205,27 @@ operating system versions that do so. So it can still make sense to enforce a
<li>&quot;traditional&quot; severity and facility based selectors</li>
<li>property-based filters</li>
</ul>
+<h3>Blocks</h3>
+<p>Rsyslogd supports BSD-style blocks inside rsyslog.conf. Each block of lines
+is separated from the previous block by a program or hostname specification. A
+block will only log messages corresponding to the most recent program and
+hostname specifications given. Thus, a block which selects ‘ppp’ as the program,
+directly followed by a block that selects messages from the hostname ‘dialhost’,
+then the second block will only log messages from the ppp program on dialhost.
+</p>
+<p>A program specification is a line beginning with ‘!prog’ and the following
+blocks will be associated with calls to syslog from that specific program. A
+program specification for ‘foo’ will also match any message logged by the kernel
+with the prefix ‘foo: ’. A hostname specification of the form ‘+hostname’ and
+the following blocks will be applied to messages received from the specified
+hostname. Alternatively, a hostname specification ‘-hostname’ causes the
+following blocks to be applied to messages from any host but the one specified.
+If the hostname is given as ‘@’, the local hostname will be used. (NOT YET
+IMPLEMENTED) A program or hostname specification may be reset by giving the
+program or hostname as ‘*’.</p>
+<p>Please note that the &quot;#!prog&quot;, &quot;#+hostname&quot; and &quot;#-hostname&quot; syntax available
+in BSD syslogd is not supported by rsyslogd. By default, no hostname or program
+is set.</p>
<h3>Selectors</h3>
<p><b>Selectors are the traditional way of filtering syslog messages.</b> They
have been kept in rsyslog with their orginal syntax, because it is well-known,
diff --git a/doc/status.html b/doc/status.html
index 92e13965..00eb69c1 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -4,10 +4,10 @@
</head>
<body>
<h2>rsyslog status page</h2>
-<p>This page reflects the status as of 2005-10-12.</p>
+<p>This page reflects the status as of 2005-10-19.</p>
<h2>Current Releases</h2>
-<p><b>development:</b> 1.11.0 - <a href="http://www.rsyslog.com/Article41.phtml">change log</a> -
-<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-21.phtml">download</a></p>
+<p><b>development:</b> 1.11.1 - <a href="http://www.rsyslog.com/Article44.phtml">change log</a> -
+<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-22.phtml">download</a></p>
<p><b>stable:</b> 1.0.2 - <a href="http://www.rsyslog.com/Article40.phtml">change log</a> -
<a href="http://www.rsyslog.com/Downloads-index-req-getit-lid-20.phtml">download</a></p>
<p>&nbsp;(<a href="version_naming.html">How are versions named?</a>)</p>