Author: tmortagne
Date: 2008-02-21 15:07:45 +0100 (Thu, 21 Feb 2008)
New Revision: 7902
Modified:
xwiki-platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm
Log:
Improve LDAP default configuration
Modified:
xwiki-platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm
===================================================================
---
xwiki-platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm
2008-02-21 14:06:38 UTC (rev 7901)
+++
xwiki-platform/xwiki-tools/trunk/xwiki-configuration-resources/src/main/resources/xwiki.cfg.vm
2008-02-21 14:07:45 UTC (rev 7902)
@@ -84,15 +84,15 @@
#-------------------------------------------------------------------------------------
#-# new LDAP authentication service
-#
xwiki.authentication.authclass=com.xpn.xwiki.ldap.authentication.XWikiLDAPAuthServiceImpl
+#
xwiki.authentication.authclass=com.xpn.xwiki.user.impl.LDAP.XWikiLDAPAuthServiceImpl
#-# Turn LDAP authentication on - otherwise only XWiki authentication
#-# 0 : disable
#-# 1 : enable
-xwiki.authentication.ldap=0
+# xwiki.authentication.ldap=1
#-# LDAP Server (Active Directory, eDirectory, OpenLDAP, etc.)
-xwiki.authentication.ldap.server=156.58.101.204
+xwiki.authentication.ldap.server=127.0.0.1
xwiki.authentication.ldap.port=389
#-# LDAP login, empty = anonymous access, otherwise specify full dn
@@ -110,13 +110,13 @@
#-# specifies the LDAP attribute containing the identifier to be used as the
XWiki name (default=cn)
xwiki.authentication.ldap.UID_attr=cn
-#-# retrieve the following fields from LDAP and store them in the XWiki user
object (xwiki-attribute=ldap-attribute)
+#-# retrieve the following fields from LDAP and store them in the XWiki user
object (xwiki-attribute=ldap-attribute)
+#-# ldap_dn=dn -- dn is set by class, caches dn in XWiki.user object for
faster access
xwiki.authentication.ldap.fields_mapping=last_name=sn,first_name=givenName,fullname=fullName,email=mail,ldap_dn=dn
-#-# ldap_dn=dn -- dn is set by class, caches dn in XWiki.user object for
faster access
#-# [SINCE 1.3M2, XWikiLDAPAuthServiceImpl]
#-# on every login update the mapped attributes from LDAP to XWiki otherwise
this happens only once when the XWiki account is created.
-#-# xwiki.authentication.ldap.update_user=1
+xwiki.authentication.ldap.update_user=1
#-# [SINCE 1.3M2, XWikiLDAPAuthServiceImpl]
#-# mapps XWiki groups to LDAP groups, separator is "|"
@@ -134,17 +134,17 @@
#-# [SINCE 1.3M2, XWikiLDAPAuthServiceImpl]
#-# if ldap authentication fails for any reason, try XWiki DB authentication
with the same credentials
-# xwiki.authentication.ldap.trylocal=1
+xwiki.authentication.ldap.trylocal=1
#-# [SINCE 1.3M2, XWikiLDAPAuthServiceImpl]
#-# SSL connection to LDAP server
#-# 0 : normal
#-# 1 : SSL
-xwiki.authentication.ldap.ssl=1
+# xwiki.authentication.ldap.ssl=0
#-# [SINCE 1.3M2, XWikiLDAPAuthServiceImpl]
#-# The keystore file to use in SSL connection
-xwiki.authentication.ldap.ssl.keystore=
+# xwiki.authentication.ldap.ssl.keystore=
#-------------------------------------------------------------------------------------
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
