packages (V5-DEVEL): rsyslog/rsyslog.conf, rsyslog/rsyslog.spec, rsyslog/rs...
lisu
lisu at pld-linux.org
Tue Oct 19 10:05:03 CEST 2010
Author: lisu Date: Tue Oct 19 08:05:03 2010 GMT
Module: packages Tag: V5-DEVEL
---- Log message:
- moved from rsyslog5.spec. 5.x.x branch is in devel, we should keep it in cvs branch
---- Files affected:
packages/rsyslog:
rsyslog.conf (1.2 -> 1.2.4.1) , rsyslog.spec (1.41 -> 1.41.4.1) , rsyslog.sysconfig (1.3 -> 1.3.4.1)
---- Diffs:
================================================================
Index: packages/rsyslog/rsyslog.conf
diff -u packages/rsyslog/rsyslog.conf:1.2 packages/rsyslog/rsyslog.conf:1.2.4.1
--- packages/rsyslog/rsyslog.conf:1.2 Sat Mar 6 23:41:10 2010
+++ packages/rsyslog/rsyslog.conf Tue Oct 19 10:04:58 2010
@@ -1,119 +1,41 @@
-#rsyslog v4 config file
+#rsyslog v3 config file
-# if you experience problems, check
-# http://www.rsyslog.com/troubleshoot for assistance
-
-#### MODULES ####
-
-$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.so # provides --MARK-- message capability
-
-# Provides UDP syslog reception
-#$ModLoad imudp.so
-#$UDPServerRun 514
-
-# Provides TCP syslog reception
+# provides support for local system logging (e.g. via logger command)
+$ModLoad imuxsock.so
+# provides kernel logging support (previously done by rklogd)
+$ModLoad imklog.so
+
+# provides --MARK-- message capability
+#$ModLoad immark.so
+# provides UDP syslog reception
+#$ModLoad imudp.so
+# provides TCP syslog reception and GSS-API (if compiled to support it)
#$ModLoad imtcp.so
-#$InputTCPServerRun 514
-
-
-# ### GLOBAL DIRECTIVES ####
-
-#
-# Use traditional timestamp format.
-# To enable high precision timestamps, comment out the following line.
-$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat
-
-# File syncing capability is disabled by default. This feature is usually not required,
-# not useful and an extreme performance hit.
-# Without that dash doesn't work.
-#$ActionFileEnableSync on
-
-#
-# Set the default permissions for all log files.
-#
-$FileOwner root
-$FileGroup logs
-$FileCreateMode 0640
-$DirCreateMode 0750
-
-# ### RULES ####
# Log all kernel messages to the console.
# Logging much else clutters up the screen.
-#kern.* /dev/console
+#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
+authpriv.* /var/log/secure
# Log all the mail messages in one place.
-mail.* -/var/log/maillog
+mail.* -/var/log/maillog
+
# Log cron stuff
-cron.* /var/log/cron
+cron.* /var/log/cron
# Everybody gets emergency messages
-*.emerg *
+*.emerg *
# Save news errors of level crit and higher in a special file.
-uucp,news.crit /var/log/spooler
+uucp,news.crit /var/log/spooler
# Save boot messages also to boot.log
-local7.* /var/log/boot.log
-
-#
-# Some "catch-all" log files.
-#
-*.=debug;\
- auth,authpriv.none;\
- news.none;mail.none -/var/log/debug
-*.=info;*.=notice;*.=warn;\
- auth,authpriv.none;\
- cron,daemon.none;\
- mail,news.none -/var/log/messages
-
-# ### Additional - from wiki ###
-# A basic template mostly from the docs, but I wanted to know what system forwarded the
-# messages so I added some text. Also I added the ":::space" to handle the windows
-# events (based on the other suggestions in the wiki)
-#
-# $template SyslFormat,"%timegenerated% [WJCG]-%HOSTNAME% %syslogtag%%msg:::space$
-
-# this is for Windows events from SNARE
-#
-# $EscapeControlCharactersOnReceive off
-
-# ### misc
-#
-# reduce any duplicates
-#
-# $RepeatedMsgReduction on
-# $OptimizeForUniprocessor on
-
-
-
-# ### 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/spppl/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
-
-
-
-# ### For central logs server use an example: host/year/month/day/facility ###
-#
-#$template DailyPerHostLogs,"/var/log/remote/%HOSTNAME%/%$YEAR%/%$MONTH%/%$DAY%/%syslogfacility-text%" #*.* -?DailyPerHostLogs
-
+local7.* /var/log/boot.log
================================================================
Index: packages/rsyslog/rsyslog.spec
diff -u packages/rsyslog/rsyslog.spec:1.41 packages/rsyslog/rsyslog.spec:1.41.4.1
--- packages/rsyslog/rsyslog.spec:1.41 Fri Aug 13 11:06:16 2010
+++ packages/rsyslog/rsyslog.spec Tue Oct 19 10:04:58 2010
@@ -1,5 +1,4 @@
# $Revision$, $Date$
-#
# Conditional build:
%bcond_without gssapi # GSSAPI Kerberos 5 support
%bcond_without mysql # MySQL database support
@@ -14,12 +13,12 @@
Summary(pt_BR.UTF-8): Registrador de log do sistema linux
Summary(tr.UTF-8): Linux sistem ve çekirdek kayıt süreci
Name: rsyslog
-Version: 4.6.4
+Version: 5.7.1
Release: 1
License: GPL v3+
Group: Daemons
Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
-# Source0-md5: 9cd32eec1984a656ab879e89b57d8076
+# Source0-md5: b49c278c28adb2f4bbe352bacd4379cc
Source1: %{name}.init
Source2: %{name}.conf
Source3: %{name}.sysconfig
@@ -30,6 +29,7 @@
%{?with_snmp:BuildRequires: net-snmp-devel}
BuildRequires: pkgconfig
%{?with_pgsql:BuildRequires: postgresql-devel}
+BuildRequires: zlib-devel
Requires(post): fileutils
Requires(post,preun): /sbin/chkconfig
Requires(post,preun): rc-scripts >= 0.2.0
@@ -51,6 +51,7 @@
Provides: syslogdaemon
Provides: user(syslog)
Obsoletes: msyslog
+Obsoletes: rsyslog5
Obsoletes: sysklogd
Obsoletes: syslog-ng
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -150,7 +151,6 @@
%build
%configure \
- --enable-imfile \
%{?with_gssapi:--enable-gssapi-krb5} \
%{?with_mysql:--enable-mysql} \
%{?with_pgsql:--enable-pgsql} \
@@ -168,7 +168,7 @@
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/rsyslog
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d/rsyslog.conf
install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rsyslog
install %{SOURCE4} $RPM_BUILD_ROOT/etc/logrotate.d/rsyslog
@@ -190,12 +190,12 @@
%post
for n in /var/log/{cron,daemon,debug,kernel,lpr,maillog,messages,secure,spooler,syslog,user}; do
if [ -f $n ]; then
- chown root:logs $n
+ chown syslog:syslog $n
continue
else
touch $n
chmod 000 $n
- chown root:logs $n
+ chown syslog:syslog $n
chmod 640 $n
fi
done
@@ -251,20 +251,18 @@
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README
%dir %{_sysconfdir}/rsyslog.d
-%attr(640,root,syslog) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyslog.conf
+%attr(640,root,syslog) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rsyslog.d/rsyslog.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rsyslog
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/rsyslog
%attr(754,root,root) /etc/rc.d/init.d/rsyslog
%attr(640,root,root) %ghost /var/log/*
%attr(755,root,root) %{_sbindir}/rsyslogd
%dir %{_libdir}/rsyslog
-%attr(755,root,root) %{_libdir}/rsyslog/imfile.so
%attr(755,root,root) %{_libdir}/rsyslog/imklog.so
%attr(755,root,root) %{_libdir}/rsyslog/immark.so
%attr(755,root,root) %{_libdir}/rsyslog/imtcp.so
%attr(755,root,root) %{_libdir}/rsyslog/imudp.so
%attr(755,root,root) %{_libdir}/rsyslog/imuxsock.so
-%attr(755,root,root) %{_libdir}/rsyslog/lmgssutil.so
%attr(755,root,root) %{_libdir}/rsyslog/lmnet.so
%attr(755,root,root) %{_libdir}/rsyslog/lmnetstrms.so
%attr(755,root,root) %{_libdir}/rsyslog/lmnsd_ptcp.so
@@ -273,10 +271,14 @@
%attr(755,root,root) %{_libdir}/rsyslog/lmtcpclt.so
%attr(755,root,root) %{_libdir}/rsyslog/lmtcpsrv.so
%attr(755,root,root) %{_libdir}/rsyslog/lmzlibw.so
+%attr(755,root,root) %{_libdir}/rsyslog/omruleset.so
+%if %{with snmp}
%attr(755,root,root) %{_libdir}/rsyslog/omsnmp.so
+%endif
%attr(755,root,root) %{_libdir}/rsyslog/omtesting.so
-%{_mandir}/man5/*
-%{_mandir}/man8/*
+%{_mandir}/man5/rsyslog.conf.5*
+%{_mandir}/man8/rsyslogd.8*
+
#%files klogd
#%defattr(644,root,root,755)
@@ -302,6 +304,7 @@
%files gssapi
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/rsyslog/imgssapi.so
+%attr(755,root,root) %{_libdir}/rsyslog/lmgssutil.so
%attr(755,root,root) %{_libdir}/rsyslog/omgssapi.so
%endif
@@ -311,140 +314,6 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.41 2010/08/13 09:06:16 lisu
-- up to 4.6.4
-- new Source0 URL
-
-Revision 1.40 2010/07/12 14:35:50 lisu
-- updated to 4.6.3
-
-Revision 1.39 2010/05/04 09:28:41 lisu
-- up to 4.6.2
-
-Revision 1.38 2010/03/06 22:41:10 zawadaa
-- some adjustment for ver. 4
-- move rsyslog.conf to /etc - world has like that - rsyslog.d is for includ.
-- few tips in rsyslog.conf added
-- check and consider if PLD could use rsyslog as default syslog daemon...
-
-Revision 1.37 2010/03/05 09:42:03 amateja
-- updated to 4.6.1
-
-Revision 1.36 2010/03/01 08:20:32 amateja
-- updated to 4.6.0
-
-Revision 1.35 2010/02/11 09:12:54 amateja
-- updated to 4.5.8
-
-Revision 1.34 2010/01/21 09:28:03 amateja
-- updated to 4.5.7
-
-Revision 1.33 2009/12/14 12:18:40 baggins
-- rel 3
-
-Revision 1.32 2009/12/09 16:45:20 sparky
-- BR: pkgconfig
-
-Revision 1.31 2009/12/09 13:33:14 baggins
-- rel 2
-
-Revision 1.30 2009/10/02 07:24:50 amateja
-- updated to 4.5.5
-
-Revision 1.29 2009/09/20 12:15:27 amateja
-- updated to 4.5.4
-
-Revision 1.28 2009/09/18 06:25:03 amateja
-- updated to 4.5.3
-
-Revision 1.27 2009/08/22 04:28:29 amateja
-- updated to 4.5.2
-
-Revision 1.26 2009/07/02 22:36:58 baggins
-- rel 2
-- switch to heimdal kerberos
-
-Revision 1.25 2009/06/23 15:19:24 paszczus
-- downgraded to 4.2.0 [stable]
-
-Revision 1.24 2009/05/28 18:32:45 amateja
-- updated to 4.3.1
-
-Revision 1.23 2009/02/17 10:13:03 paszczus
-- updated to 4.1.4
-
-Revision 1.22 2008/11/30 20:33:20 arekm
-- up to 4.1.1
-
-Revision 1.21 2008/10/10 06:18:13 paszczus
-- updated to 3.18.5
-
-Revision 1.20 2008/09/19 06:38:05 paszczus
-- updated to 3.18.4
-
-Revision 1.19 2008/08/19 06:23:36 paszczus
-- updated to 3.18.3
-
-Revision 1.18 2008/08/17 19:50:27 qboosh
-- killed bogus -devel
-
-Revision 1.17 2008/08/09 19:31:55 paszczus
-- updated to 3.18.2
-- added -devel subpackage
-
-Revision 1.16 2008/07/22 08:50:51 paszczus
-- updated to 3.18.1
-
-Revision 1.15 2008/07/09 18:52:42 qboosh
-- PLDized init script
-
-Revision 1.14 2008/07/09 13:29:59 glen
-- no macro for sysconfig or logrotate.d
-
-Revision 1.13 2008/07/09 13:28:21 glen
-- revert (plz adapter in utf8 mode)
-
-Revision 1.12 2008/07/09 13:24:44 paszczus
-- adaptarized
-
-Revision 1.11 2008/07/09 05:29:06 qboosh
-- cleanup
-- pl
-- don't create empty -klogd package
-
-Revision 1.10 2008/07/03 10:46:12 paszczus
-- added dir
-
-Revision 1.9 2008/07/03 09:54:07 paszczus
-- package only if --with build
-
-Revision 1.8 2008/07/03 09:43:40 paszczus
-- added rsyslog.{init,conf,sysconfig} files from fedora (need to pldize them?)
-- cleanups
-
-Revision 1.7 2008/07/03 09:33:38 paszczus
-- pldize, thx glen
-
-Revision 1.6 2008/07/03 09:29:37 paszczus
-- BR in proper place; adaptarized
-
-Revision 1.5 2008/07/03 09:27:54 paszczus
-- added subpackages
-- fixed packaging
-- cleanups
-
-Revision 1.4 2008/07/03 08:50:42 paszczus
-- adaptarized
-
-Revision 1.3 2008/07/03 08:49:42 paszczus
-- updated to 3.16.2
-- removed TODO; added bconds mysql,pgsql,snmp
-- NFY (same error as in previous revision - %files needs to be corrected)
-- release 0.1
-
-Revision 1.2 2008/02/09 22:40:43 blues
-- md5 fixed, few building fixes. Builds, works, needs packaging finish and
- some fine-tuning.
+Revision 1.41.4.1 2010/10/19 08:04:58 lisu
+- moved from rsyslog5.spec. 5.x.x branch is in devel, we should keep it in cvs branch
-Revision 1.1 2008-02-09 20:34:40 blues
-- initial, replacement of sysklogd from fedora
================================================================
Index: packages/rsyslog/rsyslog.sysconfig
diff -u packages/rsyslog/rsyslog.sysconfig:1.3 packages/rsyslog/rsyslog.sysconfig:1.3.4.1
--- packages/rsyslog/rsyslog.sysconfig:1.3 Sat Mar 6 23:41:10 2010
+++ packages/rsyslog/rsyslog.sysconfig Tue Oct 19 10:04:58 2010
@@ -1,5 +1,5 @@
# Options to syslogd
# syslogd options are deprecated in rsyslog v3
# if you want to use them, switch to compatibility mode 2 by "-c 2"
-SYSLOGD_OPTIONS="-c4 -f/etc/rsyslog.conf"
+SYSLOGD_OPTIONS="-c3 -f/etc/rsyslog.d/rsyslog.conf"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog/rsyslog.conf?r1=1.2&r2=1.2.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog/rsyslog.spec?r1=1.41&r2=1.41.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rsyslog/rsyslog.sysconfig?r1=1.3&r2=1.3.4.1&f=u
More information about the pld-cvs-commit
mailing list