mathieu: server/kolabd/kolabd/dist_conf centos-clarkconnect, 1.13, 1.14 common, 1.51, 1.52 debian, 1.23, 1.24 kolab, 1.68, 1.69 mandriva, 1.13, 1.14 suse, 1.81, 1.82

[cvs at kolab.org]

Author: mathieu

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

Modified Files:
	centos-clarkconnect common debian kolab mandriva suse 
Log Message:
kolab/issue3387 (dist_conf configuration in kolab webclient templates)


Index: centos-clarkconnect
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/centos-clarkconnect,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- centos-clarkconnect	18 Nov 2008 17:50:58 -0000	1.13
+++ centos-clarkconnect	7 Feb 2009 15:51:27 -0000	1.14
@@ -202,6 +202,12 @@
 webserver_confdir=/usr/webconfig/etc
 webserver_sslmutex=${webserver_logdir}/ssl_mutex
 webserver_sslscache=/var/cache/mod_ssl/scache
+
+#webclient
+horde_cookie_path=/client
+horde_confdir=${webserver_document_root}/client/config
+kronolith_confdir=${webserver_document_root}/client/kronolith/config
+
 phplibdir=/usr/webconfig/include
 phplibdir2=/usr/webconfig/include
 phppeardir=/usr/webconfig/pear

Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- common	12 Dec 2008 10:28:56 -0000	1.51
+++ common	7 Feb 2009 15:51:27 -0000	1.52
@@ -142,4 +142,7 @@
 	-e 's,[@]webserver_sslscache[@],$(webserver_sslscache),g' \
 	-e 's,[@]webserver_tmpdir[@],$(webserver_tmpdir),g' \
 	-e 's,[@]webserver_usr[@],$(webserver_usr),g' \
-	-e 's,[@]webserver_web_prefix[@],$(webserver_web_prefix),g'
+	-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'

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- debian	6 Jan 2009 22:20:28 -0000	1.23
+++ debian	7 Feb 2009 15:51:27 -0000	1.24
@@ -127,6 +127,11 @@
 webserver_usr=www-data
 webserver_grp=www-data
 
+#webclient
+horde_cookie_path=/horde3
+horde_confdir=${sysconfdir}/kolab-webclient/horde3
+kronolith_confdir=${sysconfdir}/kolab-webclient/kronolith2
+
 phpini_dir=${sysconfdir}/kolab
 phplibdir=${datadir}/php
 phplibdir2=${datadir}/php

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- kolab	12 Dec 2008 11:24:57 -0000	1.68
+++ kolab	7 Feb 2009 15:51:27 -0000	1.69
@@ -147,6 +147,11 @@
 webserver_usr=${kolab_usr}
 webserver_grp=${kolab_grp}
 
+#webclient
+horde_cookie_path=/client
+horde_confdir=${webserver_document_root}/client/config
+kronolith_confdir=${webserver_document_root}/client/kronolith/config
+
 phpini_dir=${sysconfdir}/apache
 phplibdir=${libdir}/php
 phplibdir2=${kolab_statedir}/php

Index: mandriva
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/mandriva,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- mandriva	18 Nov 2008 17:50:58 -0000	1.13
+++ mandriva	7 Feb 2009 15:51:27 -0000	1.14
@@ -63,6 +63,11 @@
 webserver_usr=apache
 webserver_grp=apache
 
+#webclient
+horde_cookie_path=/client
+horde_confdir=${webserver_document_root}/client/config
+kronolith_confdir=${webserver_document_root}/client/kronolith/config
+
 sysrundir = /var/run
 
 resmgr_scriptsdir=${resmgr_confdir}

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- suse	12 Dec 2008 10:28:56 -0000	1.81
+++ suse	7 Feb 2009 15:51:27 -0000	1.82
@@ -131,6 +131,11 @@
 webserver_usr=wwwrun
 webserver_grp=www
 
+#webclient
+horde_cookie_path=/client
+horde_confdir=${webserver_document_root}/client/config
+kronolith_confdir=${webserver_document_root}/client/kronolith/config
+
 phpini_dir=${sysconfdir}/php5/cli
 phplibdir=${datadir}/php5
 phplibdir2=${datadir}/php5