- Changed /etc/rsyslog.early.conf to just include rsyslog.conf,
fixed spec to use sd-daemon.[ch] from docs on 11.4 only. OBS-URL: https://build.opensuse.org/package/show/Base:System/rsyslog?expand=0&rev=75
This commit is contained in:
Git OBS Bridge
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 20 13:44:36 UTC 2012 - mt@suse.com
|
||||
|
||||
- Changed /etc/rsyslog.early.conf to just include rsyslog.conf,
|
||||
fixed spec to use sd-daemon.[ch] from docs on 11.4 only.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 20 12:11:18 UTC 2012 - mt@suse.com
|
||||
|
||||
|
||||
@@ -2,152 +2,12 @@
|
||||
## NOTE: This config file is obsolete and will be dropped in
|
||||
## further package versions. Even while early syslog
|
||||
## start, the /etc/rsyslog.conf file is used now.
|
||||
## See rsyslog.conf and remote.conf for more details.
|
||||
##
|
||||
## We still ship the file, because systemd does not
|
||||
## provide a way to execute syslog-service-generator.
|
||||
##
|
||||
|
||||
#
|
||||
# if you experience problems, check
|
||||
# http://www.rsyslog.com/troubleshoot for assistance
|
||||
# and report them at http://bugzilla.novell.com/
|
||||
#
|
||||
|
||||
# since rsyslog v3: load input modules
|
||||
# If you do not load inputs, nothing happens!
|
||||
|
||||
# provides --MARK-- message capability (every 1 hour)
|
||||
$ModLoad immark.so
|
||||
$MarkMessagePeriod 3600
|
||||
|
||||
# provides support for local system logging (e.g. via logger command)
|
||||
$ModLoad imuxsock.so
|
||||
|
||||
# reduce dupplicate log messages (last message repeated n times)
|
||||
$RepeatedMsgReduction on
|
||||
|
||||
# kernel logging (may be also provided by /sbin/klogd)
|
||||
# see also http://www.rsyslog.com/doc-imklog.html.
|
||||
$ModLoad imklog.so
|
||||
# set log level 1 (same as in /etc/sysconfig/syslog).
|
||||
$klogConsoleLogLevel 1
|
||||
|
||||
#
|
||||
# Use traditional log format by default. To change a single
|
||||
# file to use rsyslog format (high-precision timestamps),
|
||||
# append ";RSYSLOG_FileFormat" to the filename. See
|
||||
# http://www.rsyslog.com/doc/rsyslog_conf_templates.html
|
||||
# for more informations.
|
||||
#
|
||||
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
|
||||
|
||||
#
|
||||
# Include config generated by /etc/init.d/syslog script
|
||||
# using the SYSLOGD_ADDITIONAL_SOCKET* variables in the
|
||||
# /etc/sysconfig/syslog file.
|
||||
#
|
||||
$IncludeConfig ADDITIONAL_SOCKETS
|
||||
|
||||
|
||||
###
|
||||
# print most important on tty10 and on the xconsole pipe
|
||||
#
|
||||
if ( \
|
||||
/* kernel up to warning except of firewall */ \
|
||||
($syslogfacility-text == 'kern') and \
|
||||
($syslogseverity <= 4 /* warning */ ) and not \
|
||||
($msg contains 'IN=' and $msg contains 'OUT=') \
|
||||
) or ( \
|
||||
/* up to errors except of facility authpriv */ \
|
||||
($syslogseverity <= 3 /* errors */ ) and not \
|
||||
($syslogfacility-text == 'authpriv') \
|
||||
) \
|
||||
then /dev/tty10
|
||||
& |/dev/xconsole
|
||||
|
||||
|
||||
# Emergency messages to everyone logged on (wall)
|
||||
*.emerg :omusrmsg:*
|
||||
|
||||
# enable this, if you want that root is informed
|
||||
# immediately, e.g. of logins
|
||||
#*.alert root
|
||||
|
||||
|
||||
#
|
||||
# firewall messages into separate file and stop their further processing
|
||||
#
|
||||
if ($syslogfacility-text == 'kern') and \
|
||||
($msg contains 'IN=' and $msg contains 'OUT=') \
|
||||
then -/var/log/firewall
|
||||
& ~
|
||||
|
||||
|
||||
#
|
||||
# acpid messages into separate file and stop their further processing
|
||||
#
|
||||
# => all acpid messages for debuging (uncomment if needed):
|
||||
#if ($programname == 'acpid' or $syslogtag == '[acpid]:') then \
|
||||
# -/var/log/acpid
|
||||
#
|
||||
# => up to notice (skip info and debug)
|
||||
if ($programname == 'acpid' or $syslogtag == '[acpid]:') and \
|
||||
($syslogseverity <= 5 /* notice */) \
|
||||
then -/var/log/acpid
|
||||
& ~
|
||||
|
||||
|
||||
#
|
||||
# NetworkManager into separate file and stop their further processing
|
||||
#
|
||||
if ($programname == 'NetworkManager') or \
|
||||
($programname startswith 'nm-') \
|
||||
then -/var/log/NetworkManager
|
||||
& ~
|
||||
|
||||
|
||||
#
|
||||
# email-messages
|
||||
#
|
||||
mail.* -/var/log/mail
|
||||
mail.info -/var/log/mail.info
|
||||
mail.warning -/var/log/mail.warn
|
||||
mail.err /var/log/mail.err
|
||||
|
||||
|
||||
#
|
||||
# news-messages
|
||||
#
|
||||
news.crit -/var/log/news/news.crit
|
||||
news.err -/var/log/news/news.err
|
||||
news.notice -/var/log/news/news.notice
|
||||
# enable this, if you want to keep all news messages
|
||||
# in one file
|
||||
#news.* -/var/log/news.all
|
||||
|
||||
|
||||
#
|
||||
# Warnings in one file
|
||||
#
|
||||
*.=warning;*.=err -/var/log/warn
|
||||
*.crit /var/log/warn
|
||||
|
||||
|
||||
#
|
||||
# the rest in one file
|
||||
#
|
||||
*.*;mail.none;news.none -/var/log/messages
|
||||
|
||||
|
||||
#
|
||||
# enable this, if you want to keep all messages
|
||||
# in one file
|
||||
#*.* -/var/log/allmessages
|
||||
|
||||
|
||||
#
|
||||
# Some foreign boot scripts require local7
|
||||
#
|
||||
local0,local1.* -/var/log/localmessages
|
||||
local2,local3.* -/var/log/localmessages
|
||||
local4,local5.* -/var/log/localmessages
|
||||
local6,local7.* -/var/log/localmessages
|
||||
$IncludeConfig ETC_RSYSLOG_CONF
|
||||
|
||||
###
|
||||
|
||||
@@ -281,10 +281,13 @@ This module provides a UDP forwarder that allows changing the sender address.
|
||||
%prep
|
||||
%setup -q -n %{name}-%{upstream_version}
|
||||
%if %{with systemd}
|
||||
%if 0%{?suse_version} <= 1140
|
||||
# Bug: https://bugzilla.novell.com/show_bug.cgi?id=656259
|
||||
# install the files systemd provides rather than what we provide.
|
||||
# On newer systems, systemd-devel provides them.
|
||||
cp -a /usr/share/doc/packages/systemd/sd-daemon.[ch] runtime/
|
||||
%endif
|
||||
%endif
|
||||
dos2unix doc/*.html
|
||||
|
||||
%build
|
||||
@@ -391,6 +394,7 @@ for file in rsyslog.conf rsyslog.early.conf rsyslog.d.remote.conf ; do
|
||||
-e 's;tty10;console;g' \
|
||||
%endif
|
||||
-e 's;ADDITIONAL_SOCKETS;%{additional_sockets};g' \
|
||||
-e 's;ETC_RSYSLOG_CONF;%{_sysconfdir}/rsyslog.conf;g' \
|
||||
-e 's;ETC_RSYSLOG_D_DIR;%{_sysconfdir}/rsyslog.d;g' \
|
||||
-e 's;ETC_RSYSLOG_D_GLOB;%{_sysconfdir}/rsyslog.d/*.conf;g' \
|
||||
-e 's;RSYSLOG_SPOOL_DIR;%{_localstatedir}/spool/rsyslog;g' \
|
||||
|
||||
Reference in New Issue
Block a user