OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Torsten Homeyer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Mar-2005 10:40:52
Branch: HEAD Handle: 2005030809405200
Modified files:
openpkg-src/imapd fsl.imapd imapd.spec rc.imapd
Log:
fixing handling of logfiles
Summary:
Revision Changes Path
1.11 +14 -2 openpkg-src/imapd/fsl.imapd
1.137 +1 -1 openpkg-src/imapd/imapd.spec
1.23 +17 -6 openpkg-src/imapd/rc.imapd
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/fsl.imapd
============================================================================
$ cvs diff -u -r1.10 -r1.11 fsl.imapd
--- openpkg-src/imapd/fsl.imapd 19 Aug 2004 15:13:53 -0000 1.10
+++ openpkg-src/imapd/fsl.imapd 8 Mar 2005 09:40:52 -0000 1.11
@@ -2,7 +2,7 @@
## fsl.imapd -- OSSP fsl configuration
##
-ident (imapd)/.+ q{
+ident (imapd|imaps|imap)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ -110,7 +110,19 @@
}
};
-ident (imap|lmtpunix|cyr_expire|ctl_cyrusdb|tls_prune)/.+ q{
+ident (cyr_expire|ctl_cyrusdb|tls_prune)/.+ q{
+ prefix(
+ prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
+ )
+ -> {
+ debug: file(
+ path="@l_prefix@/var/imapd/log/cyr_db.log",
+ perm=0666
+ )
+ }
+};
+
+ident (lmtpunix)/.+ q{
prefix(
prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/imapd.spec
============================================================================
$ cvs diff -u -r1.136 -r1.137 imapd.spec
--- openpkg-src/imapd/imapd.spec 15 Feb 2005 18:28:14 -0000 1.136
+++ openpkg-src/imapd/imapd.spec 8 Mar 2005 09:40:52 -0000 1.137
@@ -34,7 +34,7 @@
Group: Mail
License: BSD
Version: 2.2.12
-Release: 20050215
+Release: 20050308
# package options
%option with_fsl yes
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/imapd/rc.imapd
============================================================================
$ cvs diff -u -r1.22 -r1.23 rc.imapd
--- openpkg-src/imapd/rc.imapd 30 Jul 2004 14:03:09 -0000 1.22
+++ openpkg-src/imapd/rc.imapd 8 Mar 2005 09:40:52 -0000 1.23
@@ -5,37 +5,42 @@
%config
imapd_enable="$openpkg_rc_def"
- imapd_cyrdel_file="@l_prefix@/var/imapd/cyrdeliver.log"
+ imapd_cyrdel_file="@l_prefix@/var/imapd/log/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_file="@l_prefix@/var/imapd/log/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_file="@l_prefix@/var/imapd/log/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_file="@l_prefix@/var/imapd/log/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_file="@l_prefix@/var/imapd/log/pop3d.log"
imapd_popd_prolog="true"
imapd_popd_epilog="true"
imapd_popd_numfiles="10"
imapd_popd_minsize="1M"
imapd_popd_complevel="9"
- imapd_misc_file="@l_prefix@/var/imapd/misc.log"
+ imapd_cyr_db_file="/mail/var/imapd/log/cyr_db.log"
+ imapd_cyr_db_prolog="true"
+ imapd_cyr_db_epilog="true"
+ imapd_cyr_db_numfiles="10"
+ imapd_cyr_db_minsize="1M"
+ imapd_misc_file="@l_prefix@/var/imapd/log/misc.log"
imapd_misc_prolog="true"
imapd_misc_epilog="true"
imapd_misc_numfiles="10"
@@ -121,6 +126,12 @@
-E "${imapd_popd_epilog}; echo 1 >$hintfile" \
${imapd_popd_file}
shtool rotate -f \
+ -n ${imapd_cyr_db_numfiles} -s ${imapd_cyr_db_minsize} -d \
+ -z ${imapd_cyr_db_complevel} -o mail-r -g mail-r -m 666 \
+ -P "${imapd_cyr_db_prolog}" \
+ -E "${imapd_cyr_db_epilog}; echo 1 >$hintfile" \
+ ${imapd_cyr_db_file}
+ shtool rotate -f \
-n ${imapd_misc_numfiles} -s ${imapd_misc_minsize} -d \
-z ${imapd_misc_complevel} -o @l_rusr@ -g @l_rgrp@ -m 666 \
-P "${imapd_misc_prolog}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
