OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 06-Aug-2003 18:05:18
Branch: HEAD Handle: 2003080617051502
Modified files:
openpkg-src/imapd imapd.spec rc.imapd
openpkg-web news.txt
Log:
#202, corrected and completed logging logic
Summary:
Revision Changes Path
1.92 +3 -3 openpkg-src/imapd/imapd.spec
1.19 +71 -12 openpkg-src/imapd/rc.imapd
1.6060 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.91 -r1.92 imapd.spec
--- openpkg-src/imapd/imapd.spec 31 Jul 2003 09:55:29 -0000 1.91
+++ openpkg-src/imapd/imapd.spec 6 Aug 2003 16:05:17 -0000 1.92
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 2.1.14
-Release: 20030731
+Release: 20030806
# package options
%option with_fsl yes
@@ -51,8 +51,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20030718, perl, perl-openpkg, make
-PreReq: OpenPKG, openpkg >= 20030718, perl, MTA
+BuildPreReq: OpenPKG, openpkg >= 20030806, perl, perl-openpkg, make
+PreReq: OpenPKG, openpkg >= 20030806, perl, MTA
BuildPreReq: sasl, db >= 4.1.24, openssl
PreReq: sasl, db >= 4.1.24, openssl
%if "%{with_fsl}" == "yes"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/rc.imapd
============================================================================
$ cvs diff -u -r1.18 -r1.19 rc.imapd
--- openpkg-src/imapd/rc.imapd 22 Jul 2003 08:10:48 -0000 1.18
+++ openpkg-src/imapd/rc.imapd 6 Aug 2003 16:05:17 -0000 1.19
@@ -5,11 +5,36 @@
%config
imapd_enable="$openpkg_rc_def"
- imapd_log_prolog="true"
- imapd_log_epilog="true"
- imapd_log_numfiles="10"
- imapd_log_minsize="1M"
- imapd_log_complevel="9"
+ imapd_cyrdel_file="@l_prefix@/var/imapd/cyrdeliver.log"
+ imapd_cyrdel_prolog="true"
+ imapd_cyrdel_epilog="true"
+ imapd_cyrdel_numfiles="10"
+ imapd_cyrdel_minsize="1M"
+ imapd_cyrdel_complevel="9"
+ imapd_imapd_file="@l_prefix@/var/imapd/imapd.log"
+ imapd_imapd_prolog="true"
+ imapd_imapd_epilog="true"
+ imapd_imapd_numfiles="10"
+ imapd_imapd_minsize="1M"
+ imapd_imapd_complevel="9"
+ imapd_lmtpd_file="@l_prefix@/var/imapd/lmtpd.log"
+ imapd_lmtpd_prolog="true"
+ imapd_lmtpd_epilog="true"
+ imapd_lmtpd_numfiles="10"
+ imapd_lmtpd_minsize="1M"
+ imapd_lmtpd_complevel="9"
+ imapd_master_file="@l_prefix@/var/imapd/master.log"
+ imapd_master_prolog="true"
+ imapd_master_epilog="true"
+ imapd_master_numfiles="10"
+ imapd_master_minsize="1M"
+ imapd_master_complevel="9"
+ imapd_popd_file="@l_prefix@/var/imapd/pop3d.log"
+ imapd_popd_prolog="true"
+ imapd_popd_epilog="true"
+ imapd_popd_numfiles="10"
+ imapd_popd_minsize="1M"
+ imapd_popd_complevel="9"
POP_type="cyrus"
POP_logfile="@l_prefix@/var/imapd/log/pop3d.log"
@@ -30,16 +55,19 @@
%start -u @l_susr@
rcService imapd enable yes || exit 0
+ rcService imapd active yes && exit 0
@l_prefix@/bin/cyrmaster &
echo $! >$imapd_pidfile
%stop -u @l_susr@
rcService imapd enable yes || exit 0
+ rcService imapd active no && exit 0
imapd_signal TERM
rm $imapd_pidfile
%restart -u @l_susr@
rcService imapd enable yes || exit 0
+ rcService imapd active no && exit 0
imapd_signal TERM
rm $imapd_pidfile
sleep 2
@@ -48,16 +76,47 @@
%reload -u @l_susr@
rcService imapd enable yes || exit 0
+ rcService imapd active no && exit 0
imapd_signal HUP
-%daily -u @l_rusr@
+%daily -u @l_susr@
rcService imapd enable yes || exit 0
- # rotate logfile
+ # rotate logfiles
+ rcTmp -i
+ hintfile=`rcTmp -f -n hint`
shtool rotate -f \
- -n ${imapd_log_numfiles} -s ${imapd_log_minsize} -d \
- -z ${imapd_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
- -P "${imapd_log_prolog}" \
- -E "${imapd_log_epilog}" \
- @l_prefix@/var/imapd/log/*.log
+ -n ${imapd_cyrdel_numfiles} -s ${imapd_cyrdel_minsize} -d \
+ -z ${imapd_cyrdel_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${imapd_cyrdel_prolog}" \
+ -E "${imapd_cyrdel_epilog} && echo 1 >$hintfile" \
+ ${imapd_cyrdel_file}
+ shtool rotate -f \
+ -n ${imapd_imapd_numfiles} -s ${imapd_imapd_minsize} -d \
+ -z ${imapd_imapd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${imapd_imapd_prolog}" \
+ -E "${imapd_imapd_epilog} && echo 1 >$hintfile" \
+ ${imapd_imapd_file}
+ shtool rotate -f \
+ -n ${imapd_lmtpd_numfiles} -s ${imapd_lmtpd_minsize} -d \
+ -z ${imapd_lmtpd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${imapd_lmtpd_prolog}" \
+ -E "${imapd_lmtpd_epilog} && echo 1 >$hintfile" \
+ ${imapd_lmtpd_file}
+ shtool rotate -f \
+ -n ${imapd_master_numfiles} -s ${imapd_master_minsize} -d \
+ -z ${imapd_master_complevel} -o @l_susr@ -g @l_rgrp@ -m 644 \
+ -P "${imapd_master_prolog}" \
+ -E "${imapd_master_epilog} && echo 1 >$hintfile" \
+ ${imapd_master_file}
+ shtool rotate -f \
+ -n ${imapd_popd_numfiles} -s ${imapd_popd_minsize} -d \
+ -z ${imapd_popd_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+ -P "${imapd_popd_prolog}" \
+ -E "${imapd_popd_epilog} && echo 1 >$hintfile" \
+ ${imapd_popd_file}
+ if [ -s $hintfile ]; then
+ rc imapd restart
+ fi
+ rcTmp -k
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6059 -r1.6060 news.txt
--- openpkg-web/news.txt 6 Aug 2003 15:27:25 -0000 1.6059
+++ openpkg-web/news.txt 6 Aug 2003 16:05:15 -0000 1.6060
@@ -1,3 +1,4 @@
+06-Aug-2003: Upgraded package: P<imapd-2.1.14-20030806>
06-Aug-2003: Upgraded package: P<openpkg-20030806-20030806>
06-Aug-2003: Upgraded package: P<perl-www-1.2.1-1.2.1>
06-Aug-2003: Upgraded package: P<perl-www-1.3.1-1.3.1>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
