[pkg-kolab] r1182 - in kolab-webclient/trunk/debian: . patches

mparent-guest at alioth.debian.org mparent-guest at alioth.debian.org
Tue Feb 3 11:48:56 UTC 2009


Author: mparent-guest
Date: 2009-02-03 11:48:56 +0000 (Tue, 03 Feb 2009)
New Revision: 1182

Modified:
   kolab-webclient/trunk/debian/changelog
   kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff
Log:
Use ldap_uri instead of fqdn when connecting to LDAP


Modified: kolab-webclient/trunk/debian/changelog
===================================================================
--- kolab-webclient/trunk/debian/changelog	2009-02-03 11:46:47 UTC (rev 1181)
+++ kolab-webclient/trunk/debian/changelog	2009-02-03 11:48:56 UTC (rev 1182)
@@ -19,10 +19,11 @@
   * Apache config in /etc/kolab-webclient/apache.conf
     - symlinked in /etc/apache2/conf.d/kolab-webclient.conf
     - apache2 is reloaded on configure
-  * 10_kolab-templates-meta.diff: Adapt KOLAB_META for kolab templates
+  * 10_kolab-templates-meta.diff:
+    - Adapt KOLAB_META for kolab templates
+    - Use ldap_uri instead of fqdn when connecting to LDAP
   * 20-data-directories.diff: Change data directories to match FHS
   * 30-cookie_path.diff: Change cookie path for Horde
   * debian/copyright: refers to versionned license version
-  * 
 
- -- Mathieu Parent <math.parent at gmail.com>  Tue, 03 Feb 2009 12:42:47 +0100
+ -- Mathieu Parent <math.parent at gmail.com>  Tue, 03 Feb 2009 12:44:51 +0100

Modified: kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff
===================================================================
--- kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff	2009-02-03 11:46:47 UTC (rev 1181)
+++ kolab-webclient/trunk/debian/patches/10_kolab-templates-meta.diff	2009-02-03 11:48:56 UTC (rev 1182)
@@ -8,7 +8,7 @@
 ===================================================================
 --- a/kolab-templates/webclient-kolab-conf.template
 +++ b/kolab-templates/webclient-kolab-conf.template
-@@ -1,7 +1,7 @@
+@@ -1,14 +1,14 @@
  KOLAB_META_START
 -TARGET=@@@webserver_document_root@@@/client/config/kolab.php
 -PERMISSIONS=0600
@@ -19,6 +19,14 @@
  KOLAB_META_END
  <?php
  $conf['cookie']['domain'] = '@@@fqdnhostname@@@';
+ $conf['cookie']['path'] = '/client';
+ $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: b/kolab-templates/webclient-kronolith-kolab-conf.template
 ===================================================================
 --- a/kolab-templates/webclient-kronolith-kolab-conf.template




More information about the pkg-kolab-devel mailing list