OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Apr-2004 16:06:26
Branch: HEAD Handle: 2004042215062600
Modified files:
openpkg-src/amavisd amavisd.spec rc.amavisd
Log:
implicitly install new amavislogsumm source, remove *.sum* files
generated by it on RPM erase, correct logfile ownership and mode when
rotating, and correct new sum and logfile rotation and generation
ordering
Summary:
Revision Changes Path
1.33 +3 -2 openpkg-src/amavisd/amavisd.spec
1.12 +9 -9 openpkg-src/amavisd/rc.amavisd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 22 Apr 2004 10:15:17 -0000 1.32
+++ openpkg-src/amavisd/amavisd.spec 22 Apr 2004 14:06:26 -0000 1.33
@@ -151,7 +151,7 @@
%{l_shtool} install -c -m 755 \
-e 's;/usr/bin/perl;%{l_prefix}/bin/perl;g' \
%{SOURCE amavislogsumm} \
- $RPM_BUILD_ROOT%{l_prefix}/sbin/amavislogsumm
+ $RPM_BUILD_ROOT%{l_prefix}/sbin/
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
'%config %{l_prefix}/etc/amavisd/amavisd.conf' \
@@ -179,9 +179,10 @@
exit 0
%preun
- # before erase, stop service
+ # before erase, stop service and remove log files
[ $1 -eq 0 ] || exit 0
%{l_rc} amavisd stop 2>/dev/null
rm -f $RPM_INSTALL_PREFIX/var/amavisd/*.log* >/dev/null 2>&1 || true
+ rm -f $RPM_INSTALL_PREFIX/var/amavisd/*.sum* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/rc.amavisd
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.amavisd
--- openpkg-src/amavisd/rc.amavisd 22 Apr 2004 10:15:17 -0000 1.11
+++ openpkg-src/amavisd/rc.amavisd 22 Apr 2004 14:06:26 -0000 1.12
@@ -47,18 +47,10 @@
%daily -u @l_susr@
rcService amavisd enable yes || exit 0
- # rotate logfile
- shtool rotate -f \
- -n ${amavisd_log_numfiles} -s ${amavisd_log_minsize} -d \
- -z ${amavisd_log_complevel} -o @l_rusr@ -g @l_mgrp@ -m 644 \
- -P "${amavisd_log_prolog}" \
- -E "${amavisd_log_epilog} && rc amavisd restart" \
- @l_prefix@/var/amavisd/amavisd.log
-
# rotate summary logfile
shtool rotate -f \
-n ${amavisd_log_numfiles} -s 0 \
- -z ${amavisd_log_complevel} -m 644 -o @l_muser@ -g @l_mgrp@ \
+ -z ${amavisd_log_complevel} -m 640 -o @l_susr@ -g @l_rgrp@ \
@l_prefix@/var/amavisd/log/amavisd.sum
# generate summary logfile
@@ -69,4 +61,12 @@
cat ${logfiles} | @l_prefix@/sbin/amavislogsumm \
-d yesterday -R -B ${amavisd_sum_flags} \
>@l_prefix@/var/amavisd/amavisd.sum 2>/dev/null
+
+ # rotate logfile
+ shtool rotate -f \
+ -n ${amavisd_log_numfiles} -s ${amavisd_log_minsize} -d \
+ -z ${amavisd_log_complevel} -m 640 -o @l_susr@ -g @l_rgrp@ \
+ -P "${amavisd_log_prolog}" \
+ -E "${amavisd_log_epilog} && rc amavisd restart" \
+ @l_prefix@/var/amavisd/amavisd.log
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
