gunnar: server/kolabd/kolabd/dist_conf common, 1.53, 1.53.2.1 kolab, 1.70, 1.70.2.1

[cvs at kolab.org]

Author: gunnar

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

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

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.53
retrieving revision 1.53.2.1
diff -u -d -r1.53 -r1.53.2.1
--- common	10 Feb 2009 22:41:14 -0000	1.53
+++ common	26 Mar 2009 21:29:45 -0000	1.53.2.1
@@ -149,4 +149,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.70
retrieving revision 1.70.2.1
diff -u -d -r1.70 -r1.70.2.1
--- kolab	10 Feb 2009 22:41:14 -0000	1.70
+++ kolab	26 Mar 2009 21:29:45 -0000	1.70.2.1
@@ -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