engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ldap: fixed ldaps port example to correct number.

Browse source
This commit is contained in:
Marcin Kuzminski 2020-04-06 16:51:44 +02:00
parent 14ac9e9a0f
commit 90b8007935
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/auth/auth-ldap-groups.rst
View file

@ -68,7 +68,7 @@ Below is example setup that can be used with Active Directory and LDAP server wi
# Multiple servers can be specified using commas
*option*: `port` => `389`
# Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
# Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
*option*: `timeout` => `300`
# Timeout for LDAP connection

2
docs/auth/auth-ldap.rst
View file

@ -58,7 +58,7 @@ Below is example setup that can be used with Active Directory/LDAP server::
# Multiple servers can be specified using commas
*option*: `port` => `389`
# Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
# Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
*option*: `timeout` => `300`
# Timeout for LDAP connection

2
docs/auth/ldap-active-directory.rst
View file

@ -22,7 +22,7 @@ authentication::
# Multiple servers can be specified using commas
*option*: `port` => `389`
# Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)
# Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS(SSL)
*option*: `timeout` => `300`
# Timeout for LDAP connection

4
rhodecode/authentication/plugins/auth_ldap.py
View file

@ -85,7 +85,7 @@ class AuthLdap(AuthLdapBase):
self.TLS_KIND = tls_kind
if self.TLS_KIND == 'LDAPS':
port = port or 689
port = port or 636
self.ldap_server_type += 's'
OPT_X_TLS_DEMAND = 2
@ -249,7 +249,7 @@ class LdapSettingsSchema(AuthnPluginSettingsSchemaBase):
colander.Int(),
default=389,
description=_('Custom port that the LDAP server is listening on. '
'Default value is: 389, use 689 for LDAPS (SSL)'),
'Default value is: 389, use 636 for LDAPS (SSL)'),
preparer=strip_whitespace,
title=_('Port'),
validator=colander.Range(min=0, max=65536),