tdraier 2004/09/17 16:35:57 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
etc/services/usermanager group-router-config.xml
router-config.xml
etc/ldap groups.ldap.properties
users.ldap.properties
Log:
added some example parameters in ldap configuration files
Revision Changes Path
1.3.4.2 +3 -1 jahia/etc/ldap/groups.ldap.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/ldap/groups.ldap.properties.diff?r1=1.3.4.1&r2=1.3.4.2&f=h
1.8.4.2 +1 -0 jahia/etc/ldap/users.ldap.properties
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/ldap/users.ldap.properties.diff?r1=1.8.4.1&r2=1.8.4.2&f=h
1.1.4.1 +39 -1 jahia/etc/services/usermanager/group-router-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/services/usermanager/group-router-config.xml.diff?r1=1.1&r2=1.1.4.1&f=h
1.8.4.1 +38 -0 jahia/etc/services/usermanager/router-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/etc/services/usermanager/router-config.xml.diff?r1=1.8&r2=1.8.4.1&f=h
Index: group-router-config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/etc/services/usermanager/Attic/group-router-config.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- group-router-config.xml 16 May 2003 13:50:21 -0000 1.1
+++ group-router-config.xml 17 Sep 2004 14:35:57 -0000 1.1.4.1
@@ -61,6 +61,44 @@
<provider-destination>ldap</provider-destination>
</criteria>
-->
-
+
+
+ <!-- this part is to specify all the available servers for a provider
+ - you could declare as many servers as you want for your ldap provider.
+ - for each server, you should declare:
+ - url, the complete url of the server
+ - username and password for connection,
+ - factory, only if you have specific needs, otherwise leave it as is,
+ - authentication mode, only if you have specific needs, otherwise leave it as
is,
+ - provider-destination, only "ldap" for the moment
+ - priority, 1 is the top priority,
+ - max-reconnection, the max tries tries before switching to the next server,
+ - referral, leave it as it is, unlesss your server doesn't support referral-->
+ <!--
+ <server>
+ <url>ldap://host1:389/</url>
+ <username></username>
+ <password></password>
+ <factory>com.sun.jndi.ldap.LdapCtxFactory</factory>
+
+ <authentication-mode>simple</authentication-mode>
+ <provider-destination>ldap</provider-destination>
+ <priority>1</priority>
+ <max-reconnection>2</max-reconnection>
+ <referral>follow</referral>
+ </server>
+ <server>
+ <url>ldap://host2:389/</url>
+ <username></username>
+ <password></password>
+ <factory>com.sun.jndi.ldap.LdapCtxFactory</factory>
+
+ <authentication-mode>simple</authentication-mode>
+ <provider-destination>ldap</provider-destination>
+ <priority>2</priority>
+ <max-reconnection>3</max-reconnection>
+ <referral>follow</referral>
+ </server>
+ -->
</router-config>
Index: router-config.xml
===================================================================
RCS file:
/home/cvs/repository/jahia/etc/services/usermanager/Attic/router-config.xml,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -r1.8 -r1.8.4.1
--- router-config.xml 5 Sep 2002 08:43:34 -0000 1.8
+++ router-config.xml 17 Sep 2004 14:35:57 -0000 1.8.4.1
@@ -58,4 +58,42 @@
<provider-destination>ldap</provider-destination>
</criteria>
-->
+
+ <!-- this part is to specify all the available servers for a provider
+ - you could declare as many servers as you want for your ldap provider.
+ - for each server, you should declare:
+ - url, the complete url of the server
+ - username and password for connection,
+ - factory, only if you have specific needs, otherwise leave it as is,
+ - authentication mode, only if you have specific needs, otherwise leave it as
is,
+ - provider-destination, only "ldap" for the moment
+ - priority, 1 is the top priority,
+ - max-reconnection, the max tries tries before switching to the next server,
+ - referral, leave it as it is, unlesss your server doesn't support referral-->
+ <!--
+ <server>
+ <url>ldap://host1:389/</url>
+ <username></username>
+ <password></password>
+ <factory>com.sun.jndi.ldap.LdapCtxFactory</factory>
+
+ <authentication-mode>simple</authentication-mode>
+ <provider-destination>ldap</provider-destination>
+ <priority>1</priority>
+ <max-reconnection>2</max-reconnection>
+ <referral>follow</referral>
+ </server>
+ <server>
+ <url>ldap://host2:389/</url>
+ <username></username>
+ <password></password>
+ <factory>com.sun.jndi.ldap.LdapCtxFactory</factory>
+
+ <authentication-mode>simple</authentication-mode>
+ <provider-destination>ldap</provider-destination>
+ <priority>2</priority>
+ <max-reconnection>3</max-reconnection>
+ <referral>follow</referral>
+ </server>
+ -->
</router-config>
Index: groups.ldap.properties
===================================================================
RCS file: /home/cvs/repository/jahia/etc/ldap/Attic/groups.ldap.properties,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- groups.ldap.properties 11 Jun 2004 17:50:49 -0000 1.3.4.1
+++ groups.ldap.properties 17 Sep 2004 14:35:57 -0000 1.3.4.2
@@ -27,4 +27,6 @@
groups.ldap.groupname.attribute.map = cn
groups.ldap.description.attribute.map = description
-
+# Map attribute to indicate which attribute of users is stored into
+# the groups.ldap.members.attribute if not dn
+#groups.ldap.members.user.attibute.map = cn
\ No newline at end of file
Index: users.ldap.properties
===================================================================
RCS file: /home/cvs/repository/jahia/etc/ldap/Attic/users.ldap.properties,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -u -r1.8.4.1 -r1.8.4.2
--- users.ldap.properties 11 Jun 2004 17:50:49 -0000 1.8.4.1
+++ users.ldap.properties 17 Sep 2004 14:35:57 -0000 1.8.4.2
@@ -21,6 +21,7 @@
# Make sure you comment out the ones you are not using, especially if the LDAP
# repository contains same names attributes. If you don't searching users will
# most probably not work correctly.
+users.ldap.defined.username.attribute.map = cn
users.ldap.firstname.attribute.map = givenName
users.ldap.lastname.attribute.map = sn
users.ldap.email.attribute.map = mail
