rpms/rsyslog
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- use RPM_OPT_FLAGS

Browse Source 
- use same pid file and logrotate file as syslog-ng (#441664)
- mark config files as noreplace (#428155)
This commit is contained in:
Peter Vrabec 2008-09-15 12:39:34 +00:00
parent ca3f22a961
commit b045de0a1b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsyslog.init
View File

@ -51,7 +51,7 @@ stop() {
} }
reload() { reload() {
RETVAL=1 RETVAL=1
syslog=`cat /var/run/rsyslogd.pid 2>/dev/null` syslog=`cat /var/run/syslogd.pid 2>/dev/null`
echo -n "Reloading system logger..." echo -n "Reloading system logger..."
if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then if [ -n "${syslog}" ] && [ -e /proc/"${syslog}" ]; then
kill -HUP "$syslog"; kill -HUP "$syslog";

2
rsyslog.log
View File

@ -1,6 +1,6 @@
/var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron { /var/log/messages /var/log/secure /var/log/maillog /var/log/spooler /var/log/boot.log /var/log/cron {
sharedscripts sharedscripts
postrotate postrotate
/bin/kill -HUP `cat /var/run/rsyslogd.pid 2> /dev/null` 2> /dev/null || true /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
endscript endscript
} }

12
rsyslog.spec
View File

@ -3,7 +3,7 @@
Summary: Enhanced system logging and kernel message trapping daemons Summary: Enhanced system logging and kernel message trapping daemons
Name: rsyslog Name: rsyslog
Version: 3.21.3 Version: 3.21.3
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv3+ License: GPLv3+
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -93,6 +93,7 @@ IETF standard protocol.
%patch1 -p1 -b .manual %patch1 -p1 -b .manual
%build %build
export CFLAGS="$RPM_OPT_FLAGS -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
%configure --sbindir=%{sbindir} \ %configure --sbindir=%{sbindir} \
--disable-static \ --disable-static \
--enable-mysql \ --enable-mysql \
@ -162,8 +163,8 @@ fi
%{_libdir}/rsyslog/lmtcpsrv.so %{_libdir}/rsyslog/lmtcpsrv.so
%{_libdir}/rsyslog/lmnetstrms.so %{_libdir}/rsyslog/lmnetstrms.so
%{_libdir}/rsyslog/lmnsd_ptcp.so %{_libdir}/rsyslog/lmnsd_ptcp.so
%config %{_sysconfdir}/rsyslog.conf %config(noreplace) %{_sysconfdir}/rsyslog.conf
%config %{_sysconfdir}/sysconfig/rsyslog %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
%config(noreplace) %{_sysconfdir}/logrotate.d/syslog %config(noreplace) %{_sysconfdir}/logrotate.d/syslog
%{_initrddir}/rsyslog %{_initrddir}/rsyslog
%{sbindir}/rsyslogd %{sbindir}/rsyslogd
@ -195,6 +196,11 @@ fi
%{_libdir}/rsyslog/lmnsd_gtls.so %{_libdir}/rsyslog/lmnsd_gtls.so
%changelog %changelog
* Mon Sep 15 2008 Peter Vrabec <pvrabec@redhat.com> 3.21.3-4
- use RPM_OPT_FLAGS
- use same pid file and logrotate file as syslog-ng (#441664)
- mark config files as noreplace (#428155)
* Mon Sep 01 2008 Tomas Heinrich <theinric@redhat.com> 3.21.3-3 * Mon Sep 01 2008 Tomas Heinrich <theinric@redhat.com> 3.21.3-3
- fix a wrong module name in the rsyslog.conf manual page (#455086) - fix a wrong module name in the rsyslog.conf manual page (#455086)
- expand the rsyslog.conf manual page (#456030) - expand the rsyslog.conf manual page (#456030)