Mercurial > kallithea
diff docs/setup.rst @ 1292:c0335c1dee36 beta
added some fixes to LDAP form re-submition, new simples ldap-settings getter.
Updated docs for new ldap fixes. Removed depracated settings model, in exchange for db model classmethods.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 27 Apr 2011 01:19:17 +0200 |
| parents | 6e5c543904ef |
| children | 61a6a7bf2cbd |
line wrap: on
line diff
--- a/docs/setup.rst Tue Apr 26 20:28:46 2011 +0200 +++ b/docs/setup.rst Wed Apr 27 01:19:17 2011 +0200 @@ -143,14 +143,14 @@ ----------------------- RhodeCode starting from version 1.1 supports ldap authentication. In order -to use LDAP, you have to install the python-ldap_ package. This package is available -via pypi, so you can install it by running +to use LDAP, you have to install the python-ldap_ package. This package is +available via pypi, so you can install it by running -:: +using easy_install:: easy_install python-ldap -:: +using pip:: pip install python-ldap @@ -168,7 +168,7 @@ Port = 389 Account = <account> Password = <password> - Enable LDAPS = checked + Connection Security = LDAPS connection Certificate Checks = DEMAND Search settings @@ -212,11 +212,19 @@ .. _Enable LDAPS: -Enable LDAPS : optional - Check this if SSL encryption is necessary for communication with the - LDAP server - it will likely require `Port`_ to be set to a different - value (standard LDAPS port is 636). When LDAPS is enabled then - `Certificate Checks`_ is required. +Connection Security : required + Defines the connection to LDAP server + + No encryption + Plain non encrypted connection + + LDAPS connection + Enable ldaps connection. It will likely require `Port`_ to be set to + a different value (standard LDAPS port is 636). When LDAPS is enabled + then `Certificate Checks`_ is required. + + START_TLS on LDAP connection + START TLS connection .. _Certificate Checks: