mathieu: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.14, 1.15 common, 1.52, 1.53 debian, 1.24, 1.25 kolab, 1.69, 1.70 mandriva, 1.14, 1.15 suse, 1.82, 1.83

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv31787/kolabd/dist_conf

Modified Files:
	centos-clarkconnect common debian kolab mandriva suse 
Log Message:
allow to configure resmgr and freebusy logging via dist_conf


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- centos-clarkconnect	7 Feb 2009 15:51:27 -0000	1.14
+++ centos-clarkconnect	10 Feb 2009 22:41:14 -0000	1.15
@@ -231,7 +231,7 @@
 # CentOS/RHEL: watch out for resmgr_conffile_usr
 
 #*************************************** HERE ************************************************************
-resmgr_logfile=${localstatedir}/log/maillog
+resmgr_logdir=${localstatedir}/log
 resmgr_confdir=${sysconfdir}/resmgr
 resmgr_conffile_usr=filter
 resmgr_conffile_grp=root
@@ -239,11 +239,15 @@
 resmgr_usr=root
 resmgr_grp=root
 resmgr_scriptsdir=/usr/sbin
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=/var/lib/resmgr/fbview.log
-freebusy_logfile=/var/log/resmgr/freebusy.log
+freebusy_logdir=/var/log/resmgr
 freebusy_confdir=${webserver_document_root}/kolab/freebusy
 freebusy_cachedir=${webserver_document_root}/kolab/freebusy/cache
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 # Total guess
 freebusy_usr=root

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- common	7 Feb 2009 15:51:27 -0000	1.52
+++ common	10 Feb 2009 22:41:14 -0000	1.53
@@ -60,6 +60,8 @@
 	-e 's,[@]freebusy_grp[@],$(freebusy_grp),g' \
 	-e 's,[@]freebusy_logdir[@],$(freebusy_logdir),g' \
 	-e 's,[@]freebusy_usr[@],$(freebusy_usr),g' \
+	-e 's,[@]freebusy_log_type[@],$(freebusy_log_type),g' \
+	-e 's,[@]freebusy_log_name[@],$(freebusy_log_name),g' \
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -121,6 +123,8 @@
 	-e 's,[@]resmgr_logdir[@],$(resmgr_logdir),g' \
 	-e 's,[@]resmgr_scriptsdir[@],$(resmgr_scriptsdir),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+	-e 's,[@]resmgr_log_type[@],$(resmgr_log_type),g' \
+	-e 's,[@]resmgr_log_name[@],$(resmgr_log_name),g' \
 	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- debian	7 Feb 2009 15:51:27 -0000	1.24
+++ debian	10 Feb 2009 22:41:14 -0000	1.25
@@ -152,6 +152,8 @@
 resmgr_usr=root
 resmgr_grp=www-data
 resmgr_filterdir=${kolab_statedir}/resmgr/filter
+resmgr_log_type=syslog
+resmgr_log_name=cons, pid
 
 fbview_logfile=${localstatedir}/log/fbview.log
 freebusy_logdir=${localstatedir}/log
@@ -159,6 +161,8 @@
 freebusy_cachedir=${kolab_statedir}/freebusy-cache
 freebusy_usr=root
 freebusy_grp=www-data
+freebusy_log_type=syslog
+freebusy_log_name=cons, pid
 
 graveyard_uidcache=${kolab_statedir}/graveyard_uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard_tscache.db

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- kolab	7 Feb 2009 15:51:27 -0000	1.69
+++ kolab	10 Feb 2009 22:41:14 -0000	1.70
@@ -173,6 +173,8 @@
 resmgr_usr=${kolab_musr}
 # @l_ngrp@
 resmgr_grp=${kolab_grp}
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logdir=${localstatedir}/kolab-freebusy/log
@@ -180,6 +182,8 @@
 freebusy_cachedir=${localstatedir}/kolab-freebusy/cache
 freebusy_usr=${kolab_musr}
 freebusy_grp=${kolab_grp}
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard-tscache.db

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mandriva	7 Feb 2009 15:51:27 -0000	1.14
+++ mandriva	10 Feb 2009 22:41:14 -0000	1.15
@@ -72,4 +72,11 @@
 
 resmgr_scriptsdir=${resmgr_confdir}
 smarty_compiledir=${phplibdir2}/${kolab_php_module_prefix}admin/templates_c
+resmgr_logdir=${localstatedir}/kolab-filter/log
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
+
+freebusy_logdir=${localstatedir}/kolab-freebusy/log
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- suse	7 Feb 2009 15:51:27 -0000	1.82
+++ suse	10 Feb 2009 22:41:14 -0000	1.83
@@ -157,6 +157,8 @@
 resmgr_filterdir=${localstatedir}/lib/kolab/kolab-filter/tmp
 resmgr_usr=root
 resmgr_grp=root
+resmgr_log_type=file
+resmgr_log_name=${resmgr_logdir}/filter.log
 
 fbview_logfile=${localstatedir}/log/kolab/fbview.log
 freebusy_logdir=${localstatedir}/log/kolab/freebusy
@@ -164,6 +166,8 @@
 freebusy_cachedir=${localstatedir}/cache/freebusy
 freebusy_usr=wwwrun
 freebusy_grp=root
+freebusy_log_type=file
+freebusy_log_name=${freebusy_logdir}/freebusy.log
 
 graveyard_uidcache=${kolab_statedir}/graveyard-uidcache.db
 graveyard_tscache=${kolab_statedir}/graveyard-tscache.db