summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-07-21 17:44:38 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-07-21 17:44:38 (GMT)
commit49737ab056d92596879e68fe0fbbfa1a06bbced2 (patch)
tree5aec012f644896c54eb64152ddd015ffa9849d43
parent77d01c3c208747da001d29157d5ced875d5ec461 (diff)
downloadkolab-server-49737ab056d92596879e68fe0fbbfa1a06bbced2.tar.gz
kolab/issue3522 (No logrotate for kolab-filter.log and friends). Also moved the resmgr.conf.template into the Kolab_Filter package where it belongs.
-rw-r--r--ChangeLog6
-rw-r--r--conf/kolab.globals.in10
-rw-r--r--rc.kolabd.in32
3 files changed, 16 insertions, 32 deletions
diff --git a/ChangeLog b/ChangeLog
index 31f72e6..4c01d43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-21 Gunnar Wrobel <p@rdus.de>
+
+ * kolab.globals.in, rc.kolabd.in:
+
+ kolab/issue3522 (No logrotate for kolab-filter.log and friends)
+
2010-07-17 Gunnar Wrobel <p@rdus.de>
* kolab2.schema, horde.schema, rfc2739.schema:
diff --git a/conf/kolab.globals.in b/conf/kolab.globals.in
index 1327ae9..2951a1f 100644
--- a/conf/kolab.globals.in
+++ b/conf/kolab.globals.in
@@ -44,6 +44,7 @@ kolab_rusr: @kolab_rusr@
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_type: @freebusy_log_type@
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@
diff --git a/rc.kolabd.in b/rc.kolabd.in
index 279b4fe..1e0b8fa 100644
--- a/rc.kolabd.in
+++ b/rc.kolabd.in
@@ -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@"
@@ -72,22 +56,6 @@
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 \
-o ${kolabd_log_fbview_owner} \