Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove duplicated ldap_bind_uri description #898

Merged
merged 1 commit into from
Sep 4, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
remove duplicated ldap_bind_uri description
  • Loading branch information
Ian Stahnke committed Sep 4, 2017
commit f45d3bee007ae8288ab6f7c6fe32618679abef8c
17 changes: 5 additions & 12 deletions docs/administration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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.

Expand Down Expand Up @@ -286,15 +286,6 @@ To configure the use of an LDAP server, the following settings must be defined.

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
:noindex:

Expand Down Expand Up @@ -327,7 +318,7 @@ The following LDAP options are not required, however TLS is always recommended.
.. data:: LDAP_CACERT_FILE
: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.

::

Expand All @@ -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': '[email protected]'}


Authentication Providers
~~~~~~~~~~~~~~~~~~~~~~~~

If you are not using an authentication provider you do not need to configure any of these options.

Expand Down