mathieu: server/kolab-webclient ChangeLog, 1.9, 1.10 webclient-kolab-conf.template, 1.1, 1.2 webclient-kronolith-kolab-conf.template, 1.1, 1.2

[cvs at kolab.org]

Author: mathieu

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv5025/kolab-webclient

Modified Files:
	ChangeLog webclient-kolab-conf.template 
	webclient-kronolith-kolab-conf.template 
Log Message:
kolab/issue3387 (dist_conf configuration in kolab webclient templates)


Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ChangeLog	8 Jan 2009 21:10:05 -0000	1.9
+++ ChangeLog	7 Feb 2009 15:51:27 -0000	1.10
@@ -1,3 +1,8 @@
+2008-02-07  Mathieu Parent <math.parent at gmail.com>
+
+	* webclient-kolab-conf.template, webclient-kronolith-kolab-conf.template: 
+	  dist_conf configuration in kolab webclient templates (kolab/issue3387)
+
 2009-01-08  Gunnar Wrobel  <p at rdus.de>
 
 	* kolab-webclient.spec: kolab/issue2207 (Make it possible to

Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kolab-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-kolab-conf.template	18 Aug 2008 08:28:21 -0000	1.1
+++ webclient-kolab-conf.template	7 Feb 2009 15:51:27 -0000	1.2
@@ -1,14 +1,14 @@
 KOLAB_META_START
-TARGET=@@@webserver_document_root@@@/client/config/kolab.php
-PERMISSIONS=0600
-OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
+TARGET=@@@horde_confdir@@@/kolab.php
+PERMISSIONS=0400
+OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
 KOLAB_META_END
 <?php
 $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
-$conf['cookie']['path'] = '/client';
+$conf['cookie']['path'] = '@@@horde_cookie_path@@@';
 $conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
 $conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
-$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
+$conf['kolab']['ldap']['server'] = '@@@ldap_uri@@@';
 $conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
 $conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
 $conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';

Index: webclient-kronolith-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/webclient-kronolith-kolab-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-kronolith-kolab-conf.template	18 Aug 2008 08:28:21 -0000	1.1
+++ webclient-kronolith-kolab-conf.template	7 Feb 2009 15:51:27 -0000	1.2
@@ -1,7 +1,7 @@
 KOLAB_META_START
-TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
-PERMISSIONS=0600
-OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
+TARGET=@@@kronolith_confdir@@@/kolab.php
+PERMISSIONS=0400
+OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
 KOLAB_META_END
 <?php
 $conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';