gunnar: server/kolabd/kolabd/dist_conf common, 1.55, 1.56 kolab, 1.71, 1.72

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	common kolab 
Log Message:
Merge from branch
(Prepare kolabd for  kolab/issue3420 (web client prefs and hooks should be configurable via templates)

cvs diff -u -d -r1.234 -r1.234.2.1 ChangeLog | patch ChangeLog
cvs diff -u -d -r1.22 -r1.22.2.1 kolab.globals.in | patch kolab.globals.in
cvs diff -u -d -r1.53 -r1.53.2.1 dist_conf/common | patch dist_conf/common
cvs diff -u -d -r1.70 -r1.70.2.1 dist_conf/kolab | patch dist_conf/kolab)

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- common	7 Mar 2009 16:20:37 -0000	1.55
+++ common	24 Apr 2009 05:01:23 -0000	1.56
@@ -151,4 +151,11 @@
 	-e 's=[@]webserver_web_prefix[@]=$(webserver_web_prefix)=g' \
 	-e 's=[@]horde_cookie_path[@]=$(horde_cookie_path)=g' \
 	-e 's=[@]horde_confdir[@]=$(horde_confdir)=g' \
-	-e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g'
+	-e 's=[@]dimp_confdir[@]=$(dimp_confdir)=g' \
+	-e 's=[@]imp_confdir[@]=$(imp_confdir)=g' \
+	-e 's=[@]ingo_confdir[@]=$(ingo_confdir)=g' \
+	-e 's=[@]kronolith_confdir[@]=$(kronolith_confdir)=g' \
+	-e 's=[@]mimp_confdir[@]=$(mimp_confdir)=g' \
+	-e 's=[@]mnemo_confdir[@]=$(mnemo_confdir)=g' \
+	-e 's=[@]nag_confdir[@]=$(nag_confdir)=g' \
+	-e 's=[@]turba_confdir[@]=$(turba_confdir)=g'

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- kolab	6 Mar 2009 08:40:56 -0000	1.71
+++ kolab	24 Apr 2009 05:01:23 -0000	1.72
@@ -150,7 +150,14 @@
 #webclient
 horde_cookie_path=/client
 horde_confdir=${webserver_document_root}/client/config
+dimp_confdir=${webserver_document_root}/client/dimp/config
+imp_confdir=${webserver_document_root}/client/imp/config
+ingo_confdir=${webserver_document_root}/client/ingo/config
 kronolith_confdir=${webserver_document_root}/client/kronolith/config
+mimp_confdir=${webserver_document_root}/client/mimp/config
+mnemo_confdir=${webserver_document_root}/client/mnemo/config
+nag_confdir=${webserver_document_root}/client/nag/config
+turba_confdir=${webserver_document_root}/client/turba/config
 
 phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php