wilde: server/kolabd/kolabd/templates freebusy.conf.template.in, 1.21, 1.21.2.1 resmgr.conf.template.in, 1.34, 1.34.2.1
cvs at kolab.org
cvs at kolab.org
Tue Oct 13 15:24:09 CEST 2009
Author: wilde
Update of /kolabrepository/server/kolabd/kolabd/templates
In directory doto:/tmp/cvs-serv14888/kolabd/kolabd/templates
Modified Files:
Tag: kolab_2_2_branch
freebusy.conf.template.in resmgr.conf.template.in
Log Message:
Added ability to map arbitrary ldap attributes to those expected by kolab.
(Merged from suc branch)
Index: freebusy.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/freebusy.conf.template.in,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -d -r1.21 -r1.21.2.1
--- freebusy.conf.template.in 10 Feb 2009 22:41:14 -0000 1.21
+++ freebusy.conf.template.in 13 Oct 2009 13:24:07 -0000 1.21.2.1
@@ -58,6 +58,24 @@
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+/**
+ * If you use customized LDAP attributes on your LDAP server the
+ * following configuration setting allows you to map the standard
+ * Kolab attribute names to your customizations.
+ *
+ * Specify the mapping line by line:
+ *
+ * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
+ * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
+ *
+ * or use a hash structure:
+ *
+ * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
+ * 'mobile' => 'handy');
+ *
+ */
+//$conf['kolab']['ldap']['map']['uid'] = 'uid2';
+
/* Horde::Kolab::IMAP configuration */
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['imap']['port'] = 143;
Index: resmgr.conf.template.in
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/templates/resmgr.conf.template.in,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -u -d -r1.34 -r1.34.2.1
--- resmgr.conf.template.in 10 Feb 2009 22:41:14 -0000 1.34
+++ resmgr.conf.template.in 13 Oct 2009 13:24:07 -0000 1.34.2.1
@@ -138,6 +138,24 @@
/* What password should we use with the above DN when binding? */
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
+/**
+ * If you use customized LDAP attributes on your LDAP server the
+ * following configuration setting allows you to map the standard
+ * Kolab attribute names to your customizations.
+ *
+ * Specify the mapping line by line:
+ *
+ * $conf['kolab']['ldap']['map']['uid'] = 'uid2';
+ * $conf['kolab']['ldap']['map']['mobile'] = 'handy';
+ *
+ * or use a hash structure:
+ *
+ * $conf['kolab']['ldap']['map'] = array('uid' => 'uid2',
+ * 'mobile' => 'handy');
+ *
+ */
+//$conf['kolab']['ldap']['map']['uid'] = 'uid2';
+
/* What account should we use to read/write calendar data? This
* account should have access to the calendar mailbox of all
* resource/group mailboxes.
More information about the commits
mailing list