Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove duplicated ldap_bind_uri description (#898)

This commit is contained in:
Ian Stahnke 2017-09-05 03:12:40 +10:00 committed by kevgliss
parent 79d12578c7
commit ff4d1edd63
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/administration.rst
View File

@ -253,8 +253,8 @@ Authentication Options
---------------------- ----------------------
Lemur currently supports Basic Authentication, LDAP Authentication, Ping OAuth2, and Google out of the box. Additional flows can be added relatively easily. Lemur currently supports Basic Authentication, LDAP Authentication, Ping OAuth2, and Google out of the box. Additional flows can be added relatively easily.
LDAP Specific Options LDAP Options
~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~
Lemur supports the use of an LDAP server in conjunction with Basic Authentication. Lemur local users can still be defined and take precedence over LDAP users. If a local user does not exist, LDAP will be queried for authentication. Only simple ldap binding with or without TLS is supported. Lemur supports the use of an LDAP server in conjunction with Basic Authentication. Lemur local users can still be defined and take precedence over LDAP users. If a local user does not exist, LDAP will be queried for authentication. Only simple ldap binding with or without TLS is supported.
@ -286,15 +286,6 @@ To configure the use of an LDAP server, the following settings must be defined.
LDAP_BIND_URI = 'ldaps://hostname' LDAP_BIND_URI = 'ldaps://hostname'
.. data:: LDAP_BIND_URI
:noindex:
Specifies the LDAP server connection string
::
LDAP_BIND_URI = 'ldaps://hostname'
.. data:: LDAP_BASE_DN .. data:: LDAP_BASE_DN
:noindex: :noindex:
@ -327,7 +318,7 @@ The following LDAP options are not required, however TLS is always recommended.
.. data:: LDAP_CACERT_FILE .. data:: LDAP_CACERT_FILE
:noindex: :noindex:
Specify a Certificate Authority file containing PEM encoded trusted issuer certificates. This can be used if your LDAP server is using certificates issued by a private CA. (ie Microsoft) Specify a Certificate Authority file containing PEM encoded trusted issuer certificates. This can be used if your LDAP server is using certificates issued by a private CA.
:: ::
@ -352,6 +343,8 @@ The following LDAP options are not required, however TLS is always recommended.
LDAP_GROUPS_TO_ROLES = {'lemur_admins': 'admin', 'Lemur Team DL Group': 'team@example.com'} LDAP_GROUPS_TO_ROLES = {'lemur_admins': 'admin', 'Lemur Team DL Group': 'team@example.com'}
Authentication Providers
~~~~~~~~~~~~~~~~~~~~~~~~
If you are not using an authentication provider you do not need to configure any of these options. If you are not using an authentication provider you do not need to configure any of these options.