gunnar: server/kolabd/kolabd ChangeLog, 1.299, 1.300 Makefile.am, 1.58, 1.59 kolab.globals.in, 1.31, 1.32 rc.kolabd.in, 1.5, 1.6
cvs at kolab.org
cvs at kolab.org
Wed Jul 21 19:44:40 CEST 2010
Author: gunnar
Update of /kolabrepository/server/kolabd/kolabd
In directory doto:/tmp/cvs-serv6154
Modified Files:
ChangeLog Makefile.am kolab.globals.in rc.kolabd.in
Log Message:
kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs.
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- ChangeLog 17 Jul 2010 13:59:14 -0000 1.299
+++ ChangeLog 21 Jul 2010 17:44:38 -0000 1.300
@@ -1,3 +1,9 @@
+2010-07-21 Gunnar Wrobel <p at rdus.de>
+
+ * kolab.globals.in, rc.kolabd.in:
+
+ kolab/issue3522 (No logrotate for kolab-filter.log and friends)
+
2010-07-17 Gunnar Wrobel <p at rdus.de>
* kolab2.schema, horde.schema, rfc2739.schema:
Index: Makefile.am
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/Makefile.am,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- Makefile.am 17 Jul 2010 14:05:00 -0000 1.58
+++ Makefile.am 21 Jul 2010 17:44:38 -0000 1.59
@@ -53,7 +53,6 @@
templates/kolab_smtpdpolicy.conf.template \
templates/php.ini.template \
templates/relocated.template \
- templates/resmgr.conf.template \
templates/saslauthd.conf.template \
templates/session_vars.php.template \
templates/slapd.access.template \
Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- kolab.globals.in 28 Jun 2010 08:43:29 -0000 1.31
+++ kolab.globals.in 21 Jul 2010 17:44:38 -0000 1.32
@@ -44,6 +44,7 @@
kolab_rgrp: @kolab_rgrp@
kolab_musr: @kolab_musr@
kolab_mgrp: @kolab_mgrp@
+kolab_susr: @kolab_susr@
kolab_hooksdir: @kolab_hooksdir@
kolab_quotawarning: @kolab_quotawarning@
hashmethod: @sbindir@/slappasswd -s
@@ -107,3 +108,12 @@
freebusy_log_name: @freebusy_log_name@
freebusy_logdir: @freebusy_logdir@
freebusy_cachedir: @freebusy_cachedir@
+resmgr_confdir: @resmgr_confdir@
+resmgr_conffile_usr: @resmgr_conffile_usr@
+resmgr_conffile_grp: @resmgr_conffile_grp@
+resmgr_tmpdir: @resmgr_tmpdir@
+resmgr_localedir: @resmgr_localedir@
+resmgr_locksdir: @resmgr_locksdir@
+resmgr_logdir: @resmgr_logdir@
+resmgr_log_type: @resmgr_log_type@
+resmgr_log_name: @resmgr_log_name@
Index: rc.kolabd.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/rc.kolabd.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rc.kolabd.in 21 Nov 2008 13:12:36 -0000 1.5
+++ rc.kolabd.in 21 Jul 2010 17:44:38 -0000 1.6
@@ -5,22 +5,6 @@
%config
kolabd_enable="$openpkg_rc_def"
- kolabd_log_resmgr_logfile="@resmgr_logfile@"
- kolabd_log_resmgr_owner="@kolab_usr@"
- kolabd_log_resmgr_group="@kolab_grp@"
- kolabd_log_resmgr_prolog="true"
- kolabd_log_resmgr_epilog="true"
- kolabd_log_resmgr_numfiles="10"
- kolabd_log_resmgr_minsize="1M"
- kolabd_log_resmgr_complevel="9"
- kolabd_log_freebusy_logfile="@freebusy_logfile@"
- kolabd_log_freebusy_owner="@kolab_usr@"
- kolabd_log_freebusy_group="@kolab_grp@"
- kolabd_log_freebusy_prolog="true"
- kolabd_log_freebusy_epilog="true"
- kolabd_log_freebusy_numfiles="10"
- kolabd_log_freebusy_minsize="1M"
- kolabd_log_freebusy_complevel="9"
kolabd_log_fbview_logfile="@fbview_logfile@"
kolabd_log_fbview_owner="@kolab_usr@"
kolabd_log_fbview_group="@kolab_grp@"
@@ -71,22 +55,6 @@
%daily -u @kolab_susr@
rcService kolabd enable yes || exit 0
# rotate logfiles
- shtool rotate -f \
- -n ${kolabd_log_resmgr_numfiles} -s ${kolabd_log_resmgr_minsize} -d \
- -z ${kolabd_log_resmgr_complevel} -m 640 \
- -o ${kolabd_log_resmgr_owner} \
- -g ${kolabd_log_resmgr_group} \
- -P "${kolabd_log_resmgr_prolog}" \
- -E "${kolabd_log_resmgr_epilog}" \
- "${kolabd_log_resmgr_logfile}"
- shtool rotate -f \
- -n ${kolabd_log_freebusy_numfiles} -s ${kolabd_log_freebusy_minsize} -d \
- -z ${kolabd_log_freebusy_complevel} -m 640 \
- -o ${kolabd_log_freebusy_owner} \
- -g ${kolabd_log_freebusy_group} \
- -P "${kolabd_log_freebusy_prolog}" \
- -E "${kolabd_log_freebusy_epilog}" \
- "${kolabd_log_freebusy_logfile}"
shtool rotate -f \
-n ${kolabd_log_fbview_numfiles} -s ${kolabd_log_fbview_minsize} -d \
-z ${kolabd_log_fbview_complevel} -m 640 \
More information about the commits
mailing list