From 01e15eda3353c604f9d1f569a8ec3acf60187aa0 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 18 Jul 2008 16:20:01 +0200 Subject: Update man pages, fix a small typo - Update the version number and date in the man pages - s/imklogd/imklog/ Signed-off-by: Rainer Gerhards --- plugins/imklog/linux.c | 2 +- rsyslog.conf.5 | 2 +- rsyslogd.8 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/imklog/linux.c b/plugins/imklog/linux.c index 25f012c3..faf20134 100644 --- a/plugins/imklog/linux.c +++ b/plugins/imklog/linux.c @@ -140,7 +140,7 @@ static enum LOGSRC GetKernelLogSrc(void) { /* Initialize kernel logging. */ ksyslog(1, NULL, 0); - imklogLogIntMsg(LOG_INFO, "imklogd %s, log source = ksyslog " + imklogLogIntMsg(LOG_INFO, "imklog %s, log source = ksyslog " "started.", VERSION); return(kernel); } diff --git a/rsyslog.conf.5 b/rsyslog.conf.5 index dd80fca0..122f3c84 100644 --- a/rsyslog.conf.5 +++ b/rsyslog.conf.5 @@ -17,7 +17,7 @@ .\" along with this program; if not, write to the Free Software .\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. .\" -.TH RSYSLOG.CONF 5 "07 April 2008" "Version 3.17.0" "Linux System Administration" +.TH RSYSLOG.CONF 5 "11 July 2008" "Version 3.18.0" "Linux System Administration" .SH NAME rsyslog.conf \- rsyslogd(8) configuration file .SH DESCRIPTION diff --git a/rsyslogd.8 b/rsyslogd.8 index a1395d73..91f2016e 100644 --- a/rsyslogd.8 +++ b/rsyslogd.8 @@ -1,7 +1,7 @@ .\" Copyright 2004-2008 Rainer Gerhards and Adiscon for the rsyslog modifications .\" May be distributed under the GNU General Public License .\" -.TH RSYSLOGD 8 "07 April 2008" "Version 3.17.0" "Linux System Administration" +.TH RSYSLOGD 8 "11 July 2008" "Version 3.18.0" "Linux System Administration" .SH NAME rsyslogd \- reliable and extended syslogd .SH SYNOPSIS -- cgit From f4b774738815dc01fc69628ed3f597f8ede3626f Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 21 Jul 2008 15:48:56 +0200 Subject: preparing for 3.18.1 --- ChangeLog | 3 ++- configure.ac | 2 +- doc/manual.html | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab78ab5c..2bb38fec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ --------------------------------------------------------------------------- -Version 3.18.1 (rgerhards), 2008-07-?? +Version 3.18.1 (rgerhards), 2008-07-21 - bugfix: potential segfault in creating message mutex in non-direct queue mode. rsyslogd segfaults on freeeBSD 7.0 (an potentially other platforms) if an action queue is running in any other mode than non-direct. The @@ -39,6 +39,7 @@ Version 3.18.1 (rgerhards), 2008-07-?? secpath-drop were not documented - doc bugfix: fixed some typos in rsyslog.conf man page - fixed typo in source comment - thanks to Rio Fujita +- some general cleanup (thanks to Michael Biebl) --------------------------------------------------------------------------- Version 3.18.0 (rgerhards), 2008-07-11 - begun a new v3-stable based on former 3.17.4 beta plus patches to diff --git a/configure.ac b/configure.ac index 85d0b260..1589ad62 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.18.0],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.18.1],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/doc/manual.html b/doc/manual.html index 5b2a039f..eb5fe52d 100644 --- a/doc/manual.html +++ b/doc/manual.html @@ -16,7 +16,7 @@ relay chains while at the same time being very easy to setup for the novice user. And as we know what enterprise users really need, there is also professional rsyslog support available directly from the source!

-

This documentation is for version 3.18.0 (v3-stable branch) of rsyslog. +

This documentation is for version 3.18.1 (v3-stable branch) of rsyslog. Visit the rsyslog status page to obtain current version information and project status.

If you like rsyslog, you might -- cgit From 22f6e935f75514d3bf63fdc42d296c9e6b7b2b4c Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 21 Jul 2008 16:00:42 +0200 Subject: bumped version number --- ChangeLog | 2 ++ configure.ac | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2bb38fec..f2ab6cb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ --------------------------------------------------------------------------- +Version 3.18.2 (rgerhards), 2008-07-?? +--------------------------------------------------------------------------- Version 3.18.1 (rgerhards), 2008-07-21 - bugfix: potential segfault in creating message mutex in non-direct queue mode. rsyslogd segfaults on freeeBSD 7.0 (an potentially other platforms) diff --git a/configure.ac b/configure.ac index 1589ad62..4c7aac3c 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[3.18.1],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[3.18.2],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([syslogd.c]) AC_CONFIG_HEADERS([config.h]) -- cgit From 9b59581a6f7d161c7aafbc3300689337939bb382 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Fri, 18 Jul 2008 16:41:52 +0200 Subject: use the $ModLoad syntax consistently. Update the documentation to use the new, preferred $ModLoad syntax: - no more MySQL - name of the in/output plugin without the trailing .so Signed-off-by: Rainer Gerhards --- doc/gssapi.html | 6 +++--- doc/imfile.html | 4 ++-- doc/imgssapi.html | 2 +- doc/imtcp.html | 4 ++-- doc/install.html | 10 +++++----- doc/omlibdbi.html | 4 ++-- doc/omsnmp.html | 4 ++-- doc/rsconf1_modload.html | 2 +- doc/rsyslog-example.conf | 2 +- doc/rsyslog_conf.html | 4 ++-- doc/rsyslog_high_database_rate.html | 18 ++++++++++-------- doc/rsyslog_mysql.html | 6 +++--- doc/rsyslog_reliable_forwarding.html | 4 ++-- doc/v3compatibility.html | 14 +++++++------- 14 files changed, 43 insertions(+), 41 deletions(-) diff --git a/doc/gssapi.html b/doc/gssapi.html index 400be4a3..3ad7d07b 100644 --- a/doc/gssapi.html +++ b/doc/gssapi.html @@ -61,7 +61,7 @@ on receiver

  • set-up rsyslog, in /etc/rsyslog.conf
    • -
  • $ModLoad omgssapi.so - load output gss module
    • +
  • $ModLoad omgssapi - load output gss module
  • $GSSForwardServiceName otherThanHost - set the name of service principal, "host" is the default one
    • @@ -81,7 +81,7 @@ rsyslog, in /etc/rsyslog.conf

  • $ModLoad -imgssapi.so - load input gss module

    +imgssapi - load input gss module

  • $InputGSSServerServiceName @@ -115,4 +115,4 @@ Copyright Gerhards and Adiscon. Released under the GNU GPL version 3 or higher.

    - \ No newline at end of file + diff --git a/doc/imfile.html b/doc/imfile.html index d8a105bf..6fc6c2e2 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -103,7 +103,7 @@ your distro puts rsyslog's config files). Note that only commands actually needed need to be specified. The second file uses less commands and uses defaults instead.

    - diff --git a/doc/imtcp.html b/doc/imtcp.html index b2c6d21d..2c8ead56 100644 --- a/doc/imtcp.html +++ b/doc/imtcp.html @@ -35,7 +35,7 @@ Sets the maximum number of sessions supported

    • Sample:

    This sets up a TCP server on port 514:

    - @@ -48,4 +48,4 @@ Copyright Gerhards and Adiscon. Released under the GNU GPL version 3 or higher.

    - \ No newline at end of file + diff --git a/doc/install.html b/doc/install.html index 711552e6..661ae943 100644 --- a/doc/install.html +++ b/doc/install.html @@ -58,11 +58,11 @@ to load plug-in modules to perform useful work (more about compatibilty notes v3). To load the most common plug-ins, add the following to the top of rsyslog.conf:

    -$ModLoad immark.so # provides --MARK-- message capability
    -$ModLoad imudp.so # provides UDP syslog reception
    -$ModLoad imtcp.so # provides TCP syslog reception and GSS-API (if compiled to support it)
    -$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 # provides --MARK-- message capability
    +$ModLoad imudp # provides UDP syslog reception
    +$ModLoad imtcp # provides TCP syslog reception and GSS-API (if compiled to support it)
    +$ModLoad imuxsock # provides support for local system logging (e.g. via logger command)
    +$ModLoad imklog # provides kernel logging support (previously done by rklogd)

    Change rsyslog.conf for any further enhancements you would like to see. For example, you can add database writing as diff --git a/doc/omlibdbi.html b/doc/omlibdbi.html index c66dc06b..8ff74371 100644 --- a/doc/omlibdbi.html +++ b/doc/omlibdbi.html @@ -106,7 +106,7 @@ database "syslog_db" on mysqlsever.example.com. The server is MySQL and being accessed under the account of "user" with password "pwd" (if you have empty passwords, just remove the $ActionLibdbiPassword line).

    -