diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | doc/v7compatibility.html | 2 | ||||
| -rw-r--r-- | platform/README | 4 | ||||
| -rwxr-xr-x | platform/freebsd/rsyslogd (renamed from freebsd/rsyslogd) | 0 | ||||
| -rw-r--r-- | platform/redhat/rsyslog.conf | 86 | ||||
| -rwxr-xr-x | platform/slackware/rc.rsyslogd (renamed from slackware/rc.rsyslogd) | 0 | ||||
| -rw-r--r-- | rsyslog.conf | 60 |
7 files changed, 95 insertions, 64 deletions
diff --git a/Makefile.am b/Makefile.am index 6093ddb9..c4499406 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,10 +58,11 @@ CLEANFILES = \ endif EXTRA_DIST = \ - freebsd/rsyslogd \ - slackware/rc.rsyslogd \ + platform/README \ + platform/freebsd/rsyslogd \ + platform/slackware/rc.rsyslogd \ + platform/redhat/rsyslog.conf \ contrib/README \ - rsyslog.conf \ COPYING \ COPYING.LESSER \ COPYING.ASL20 \ diff --git a/doc/v7compatibility.html b/doc/v7compatibility.html index 504af9f2..da4772fe 100644 --- a/doc/v7compatibility.html +++ b/doc/v7compatibility.html @@ -25,7 +25,7 @@ has been implemented. Consequently, situations where the previous behaviour were desired need now to be solved differently. We do not think that this will cause any problems to anyone, especially as in v6 this was announced as a missing feature. -<h2>omusrmsr: using just a username or "*" is deprecated</h2> +<h2>omusrmsg: using just a username or "*" is deprecated</h2> <p>In legacy config format, the asterisk denotes writing the message to all users. This is usually used for emergency messages and configured like this: <pre> diff --git a/platform/README b/platform/README new file mode 100644 index 00000000..adbc3013 --- /dev/null +++ b/platform/README @@ -0,0 +1,4 @@ +This subdirectory contains platform-specific files. They are maintained +based on a best effort basis, and are not necessarily the same like the +specific platform ships them. Some files are changed in the way the +rsyslog projects would recommend them; some may even be outdated. diff --git a/freebsd/rsyslogd b/platform/freebsd/rsyslogd index 1cbcb6fe..1cbcb6fe 100755 --- a/freebsd/rsyslogd +++ b/platform/freebsd/rsyslogd diff --git a/platform/redhat/rsyslog.conf b/platform/redhat/rsyslog.conf new file mode 100644 index 00000000..2210962b --- /dev/null +++ b/platform/redhat/rsyslog.conf @@ -0,0 +1,86 @@ +# rsyslog configuration file (for Red Hat-based systems) +# note that most of this config file uses old-style format, +# because it is well-known AND quite suitable for simple cases +# like we have with the default config. For more advanced +# things, RainerScript configuration is suggested. + +# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html +# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html + +#### MODULES #### + +module(load="imuxsock") # provides support for local system logging (e.g. via logger command) +module(load="imklog") # provides kernel logging support (previously done by rklogd) +#module(load"immark") # provides --MARK-- message capability + +# Provides UDP syslog reception +# for parameters see http://www.rsyslog.com/doc/imudp.html +#module(load="imudp") # needs to be done just once +#input(type="imudp" port="514") + +# Provides TCP syslog reception +# for parameters see http://www.rsyslog.com/doc/imtcp.html +#module(load="imtcp") # needs to be done just once +#input(type="imtcp" port="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 + +# Include all config files in /etc/rsyslog.d/ +$IncludeConfig /etc/rsyslog.d/*.conf + + +#### RULES #### + +# Log all kernel messages to the console. +# Logging much else clutters up the screen. +#kern.* /dev/console + +# Log anything (except mail) of level info or higher. +# Don't log private authentication messages! +*.info;mail.none;authpriv.none;cron.none /var/log/messages + +# The authpriv file has restricted access. +authpriv.* /var/log/secure + +# Log all the mail messages in one place. +mail.* /var/log/maillog + + +# Log cron stuff +cron.* /var/log/cron + +# Everybody gets emergency messages +*.emerg :omusrmsg:* + +# Save news errors of level crit and higher in a special file. +uucp,news.crit /var/log/spooler + +# 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/lib/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 ### diff --git a/slackware/rc.rsyslogd b/platform/slackware/rc.rsyslogd index f5f8f458..f5f8f458 100755 --- a/slackware/rc.rsyslogd +++ b/platform/slackware/rc.rsyslogd diff --git a/rsyslog.conf b/rsyslog.conf deleted file mode 100644 index 47fc4402..00000000 --- a/rsyslog.conf +++ /dev/null @@ -1,60 +0,0 @@ -# if you experience problems, check -# http://www.rsyslog.com/troubleshoot for assistance - -# rsyslog v3: load input modules -# If you do not load inputs, nothing happens! -# You may need to set the module load path if modules are not found. - -$ModLoad immark # provides --MARK-- message capability -$ModLoad imuxsock # provides support for local system logging (e.g. via logger command) -$ModLoad imklog # kernel logging (formerly provided by rklogd) - -# Log all kernel messages to the console. -# Logging much else clutters up the screen. -#kern.* /dev/console - -# Log anything (except mail) of level info or higher. -# Don't log private authentication messages! -*.info;mail.none;authpriv.none;cron.none -/var/log/messages - -# The authpriv file has restricted access. -authpriv.* /var/log/secure - -# Log all the mail messages in one place. -mail.* -/var/log/maillog - - -# Log cron stuff -cron.* -/var/log/cron - -# Everybody gets emergency messages -*.emerg * - -# Save news errors of level crit and higher in a special file. -uucp,news.crit -/var/log/spooler - -# Save boot messages also to boot.log -local7.* /var/log/boot.log - -# 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 /rsyslog/spool # where to place spool files -#$ActionQueueFileName uniqName # 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 - - -# ######### Receiving Messages from Remote Hosts ########## -# TCP Syslog Server: -# provides TCP syslog reception and GSS-API (if compiled to support it) -#$ModLoad imtcp.so # load module -#$InputTCPServerRun 514 # start up TCP listener at port 514 - -# UDP Syslog Server: -#$ModLoad imudp.so # provides UDP syslog reception -#$UDPServerRun 514 # start a UDP syslog server at standard port 514 |