diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-06-19 09:49:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-06-19 09:49:31 +0000 |
| commit | 98822c0291e1bb63b939d41e16c9cd3abd780458 (patch) | |
| tree | 4298a2b837aac15692d8161370d315d39435b8e1 | |
| parent | 0bf6279c09a8ae8ae099aa436adf04782cc1d0f9 (diff) | |
| parent | 16831461d3b1c662706ab023c362b2bb60fe988e (diff) | |
| download | gitlab-ce-98822c0291e1bb63b939d41e16c9cd3abd780458.tar.gz | |
Merge branch 'patch-28' into 'master'
Make it explicit where is the gitlab.rb file
See merge request gitlab-org/gitlab-ce!19963
| -rw-r--r-- | doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md index aa5e9513290..621d4f77d5e 100644 --- a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md +++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md @@ -107,7 +107,7 @@ Global Admins GitLab.org/GitLab INT/Global Groups/Global Admins ## GitLab LDAP configuration -The initial configuration of LDAP in GitLab requires changes to the `gitlab.rb` configuration file. Below is an example of a complete configuration using an Active Directory. +The initial configuration of LDAP in GitLab requires changes to the `gitlab.rb` configuration file (`/etc/gitlab/gitlab.rb`). Below is an example of a complete configuration using an Active Directory. The two Active Directory specific values are `active_directory: true` and `uid: 'sAMAccountName'`. `sAMAccountName` is an attribute returned by Active Directory used for GitLab usernames. See the example output from `ldapsearch` for a full list of attributes a "person" object (user) has in **AD** - [`ldapsearch` example](#using-ldapsearch-unix) |