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: 23-Apr-2004 11:40:52
Branch: HEAD Handle: 2004042310405200
Modified files:
openpkg-src/amavisd amavisd.spec rc.amavisd
Log:
add sleep between rc restarts, correct logfile order, and correct
logfile paths
Summary:
Revision Changes Path
1.34 +1 -1 openpkg-src/amavisd/amavisd.spec
1.13 +7 -6 openpkg-src/amavisd/rc.amavisd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/amavisd.spec
============================================================================
$ cvs diff -u -r1.33 -r1.34 amavisd.spec
--- openpkg-src/amavisd/amavisd.spec 22 Apr 2004 14:06:26 -0000 1.33
+++ openpkg-src/amavisd/amavisd.spec 23 Apr 2004 09:40:52 -0000 1.34
@@ -38,7 +38,7 @@
Group: Mail
License: GPL
Version: %{V_major}%{V_minor}
-Release: 20040422
+Release: 20040423
# package options
%option with_milter no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/amavisd/rc.amavisd
============================================================================
$ cvs diff -u -r1.12 -r1.13 rc.amavisd
--- openpkg-src/amavisd/rc.amavisd 22 Apr 2004 14:06:26 -0000 1.12
+++ openpkg-src/amavisd/rc.amavisd 23 Apr 2004 09:40:52 -0000 1.13
@@ -41,8 +41,9 @@
%restart -u @l_susr@
rcService amavisd enable yes || exit 0
rcService amavisd active no && exit 0
- @l_prefix@/sbin/amavisd -c $amavisd_cfgfile stop
- @l_prefix@/sbin/amavisd -c $amavisd_cfgfile
+ rc amavisd stop
+ sleep 2
+ rc amavisd start
%daily -u @l_susr@
rcService amavisd enable yes || exit 0
@@ -51,12 +52,12 @@
shtool rotate -f \
-n ${amavisd_log_numfiles} -s 0 \
-z ${amavisd_log_complevel} -m 640 -o @l_susr@ -g @l_rgrp@ \
- @l_prefix@/var/amavisd/log/amavisd.sum
+ @l_prefix@/var/amavisd/amavisd.sum
# generate summary logfile
- logfiles="@l_prefix@/var/amavisd/log/amavisd.log"
- if [ -f "@l_prefix@/var/amavisd/log/amavisd.log.0" ]; then
- logfiles="$logfiles @l_prefix@/var/amavisd/log/amavisd.log.0"
+ logfiles="@l_prefix@/var/amavisd/amavisd.log"
+ if [ -f "@l_prefix@/var/amavisd/amavisd.log.0" ]; then
+ logfiles="@l_prefix@/var/amavisd/amavisd.log.0 $logfiles"
fi
cat ${logfiles} | @l_prefix@/sbin/amavislogsumm \
-d yesterday -R -B ${amavisd_sum_flags} \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
