gunnar: server/kolabd/kolabd ChangeLog, 1.247, 1.248 kolab.globals.in, 1.24, 1.25

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	ChangeLog kolab.globals.in 
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: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/ChangeLog,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- ChangeLog	20 Apr 2009 16:25:47 -0000	1.247
+++ ChangeLog	24 Apr 2009 05:01:22 -0000	1.248
@@ -65,6 +65,11 @@
 	kolab/issue2499 (Notification messages by the resource manager
 	sould be localized)
 
+2009-03-26  Gunnar Wrobel  <p at rdus.de>
+
+	* kolab.globals.in: Prepare kolabd for additional webclient
+	configuration templates.
+
 2009-03-03  Thomas Arendsen Hein  <thomas at intevation.de>
 
 	* templates/httpd.conf.template.in: "AllowOverride All" for /client to

Index: kolab.globals.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/kolab.globals.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- kolab.globals.in	17 Mar 2009 16:46:31 -0000	1.24
+++ kolab.globals.in	24 Apr 2009 05:01:23 -0000	1.25
@@ -50,7 +50,14 @@
 webserver_grp: @webserver_grp@
 horde_cookie_path: @horde_cookie_path@
 horde_confdir: @horde_confdir@
+dimp_confdir: @dimp_confdir@
+ingo_confdir: @ingo_confdir@
+imp_confdir: @imp_confdir@
 kronolith_confdir: @kronolith_confdir@
+mimp_confdir: @mimp_confdir@
+mnemo_confdir: @mnemo_confdir@
+nag_confdir: @nag_confdir@
+turba_confdir: @turba_confdir@
 kolab_statedir: @kolab_statedir@
 kolab_pidfile: @kolab_pidfile@
 kolab_mailboxuiddb: @kolab_mailboxuiddb@