diff options
| author | Evan Read <eread@gitlab.com> | 2019-07-30 13:09:08 +1000 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2019-07-31 11:04:45 +1000 |
| commit | 2fb304bf0f72cbaf3c19d3a889640431c6ae7085 (patch) | |
| tree | 140528c25f60d6876f5589f307f4c0e8351f7729 | |
| parent | 0a71a16413ad5da9a4d23f7ae8780b550186422f (diff) | |
| download | gitlab-ce-2fb304bf0f72cbaf3c19d3a889640431c6ae7085.tar.gz | |
Clarify what filters are for
| -rw-r--r-- | doc/administration/auth/ldap-ee.md | 7 | ||||
| -rw-r--r-- | doc/administration/auth/ldap.md | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/administration/auth/ldap-ee.md b/doc/administration/auth/ldap-ee.md index 4ce008f886c..face54e6770 100644 --- a/doc/administration/auth/ldap-ee.md +++ b/doc/administration/auth/ldap-ee.md @@ -118,9 +118,14 @@ or Owner). In GitLab Premium, you can add: - A GitLab group to sync with one or multiple LDAP groups. -- A filter. The filter must comply with the syntax defined in +- A filter. Filters allow for complex logic without creating a special + GitLab group. The filter must comply with the syntax defined in [RFC 2254](https://tools.ietf.org/search/rfc2254). + For example, all users that are members of LDAP groups `A` and `B` are given + Developer permissions without needing to add them to a GitLab group mapped to + LDAP groups `A` and `B`. + ## Administrator sync As an extension of group sync, you can automatically manage your global GitLab diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 4b2c719b55f..beacaa99d60 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -77,9 +77,12 @@ NOTE: **Note**: In GitLab Enterprise Edition Starter, you can configure multiple LDAP servers to connect to one GitLab server. -For a complete guide on configuring LDAP with GitLab Community Edition, please check -the admin guide [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md). -For GitLab Enterprise Editions, see also [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md). **(STARTER ONLY)** +For a complete guide on configuring LDAP with: + +- GitLab Community Edition, see + [How to configure LDAP with GitLab CE](how_to_configure_ldap_gitlab_ce/index.md). +- Enterprise Editions, see + [How to configure LDAP with GitLab EE](how_to_configure_ldap_gitlab_ee/index.md). **(STARTER ONLY)** To enable LDAP integration you need to add your LDAP server settings in `/etc/gitlab/gitlab.rb` or `/home/git/gitlab/config/gitlab.yml` for Omnibus |