martin: server/kolabd/kolabd/dist_conf common, 1.3, 1.4 kolab, 1.3, 1.4

[cvs at intevation.de]

Author: martin

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

Modified Files:
	common kolab 
Log Message:
Martin Konold: Plain and simple renaming patch from Richard (see issue 1009)


Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- common	27 Nov 2005 11:58:41 -0000	1.3
+++ common	27 Nov 2005 23:57:02 -0000	1.4
@@ -9,8 +9,9 @@
 	-e 's,[@]localstatedir[@],$(localstatedir),g' \
 	-e 's,[@]phplibdir[@],$(phplibdir),g' \
 	-e 's,[@]phplibdir2[@],$(phplibdir2),g' \
-	-e 's,[@]bash_exec[@],$(bash_exec),g' \
-	-e 's,[@]perl_exec[@],$(perl_exec),g' \
+	-e 's,[@]BASH[@],$(BASH),g' \
+	-e 's,[@]PERL[@],$(PERL),g' \
+	-e 's,[@]PHP[@],$(PHP),g' \
 	-e 's,[@]restricted_kolab_grp[@],$(restricted_kolab_grp),g' \
 	-e 's,[@]VERSION[@],$(VERSION),g' \
 	-e 's,[@]amavisd_confdir[@],$(amavisd_confdir),g' \
@@ -38,6 +39,7 @@
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
 	-e 's,[@]freebusy_logfile[@],$(freebusy_logfile),g' \
+	-e 's,[@]freebusy_cachefile[@],$(freebusy_cachefile),g' \
 	-e 's,[@]freshclam_logfile[@],$(freshclam_logfile),g' \
 	-e 's,[@]freshclam_pidfile[@],$(freshclam_pidfile),g' \
 	-e 's,[@]fsl_logfile[@],$(fsl_logfile),g' \
@@ -86,6 +88,7 @@
 	-e 's,[@]resmgr_grp[@],$(resmgr_grp),g' \
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
+	-e 's,[@]resmgr_filter[@],$(resmgr_filter),g' \
 	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
 	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- kolab	27 Nov 2005 11:58:41 -0000	1.3
+++ kolab	27 Nov 2005 23:57:02 -0000	1.4
@@ -21,8 +21,9 @@
 
 kolab_rcdir=${sysconfdir}/rc.d
 
-bash_exec=${libdir}/openpkg/bash
-perl_exec=${bindir}/perl
+BASH=${libdir}/openpkg/bash
+PERL=${bindir}/perl
+PHP=${bindir}/php
 
 amavisd_confdir=${sysconfdir}/amavisd
 amavisd_logfile=${localstatedir}/amavisd/amavis.log
@@ -147,6 +148,7 @@
 
 resmgr_logfile=${localstatedir}/resmgr/resmgr.log
 resmgr_confdir=${sysconfdir}/resmgr
+resmgr_filter=${localstatedir}/resmgr/filter
 # @l_musr@
 resmgr_usr=kolab
 # @l_ngrp@
@@ -154,6 +156,7 @@
 
 fbview_logfile=${localstatedir}/resmgr/fbview.log
 freebusy_logfile=${localstatedir}/resmgr/freebusy.log
+freebusy_cachefile=${webserver_document_root}/freebusy/cache
 
 graveyard_uidcache=${localstatedir}/kolab/graveyard_uidcache.db
 graveyard_tscache=${localstatedir}/kolab/graveyard_tscache.db