Commit a68630e06aee36c6304417f3ae8630cfca0ff107
Exists in
spb-stable
and in
3 other branches
Merge branch 'user_principal_name' into 'master'
Explain how to use userPrincipalName as the username with AD
Showing
1 changed file
with
4 additions
and
0 deletions
Show diff stats
config/gitlab.yml.example
| @@ -129,9 +129,13 @@ production: &base | @@ -129,9 +129,13 @@ production: &base | ||
| 129 | password: '_the_password_of_the_bind_user' | 129 | password: '_the_password_of_the_bind_user' |
| 130 | # If allow_username_or_email_login is enabled, GitLab will ignore everything | 130 | # If allow_username_or_email_login is enabled, GitLab will ignore everything |
| 131 | # after the first '@' in the LDAP username submitted by the user on login. | 131 | # after the first '@' in the LDAP username submitted by the user on login. |
| 132 | + # | ||
| 132 | # Example: | 133 | # Example: |
| 133 | # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; | 134 | # - the user enters 'jane.doe@example.com' and 'p@ssw0rd' as LDAP credentials; |
| 134 | # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. | 135 | # - GitLab queries the LDAP server with 'jane.doe' and 'p@ssw0rd'. |
| 136 | + # | ||
| 137 | + # If you are using "uid: 'userPrincipalName'" on ActiveDirectory you need to | ||
| 138 | + # disable this setting, because the userPrincipalName contains an '@'. | ||
| 135 | allow_username_or_email_login: true | 139 | allow_username_or_email_login: true |
| 136 | 140 | ||
| 137 | ## OmniAuth settings | 141 | ## OmniAuth settings |