Commit 00ecacf8 authored by Douwe Maan's avatar Douwe Maan

Add to docs

parent c52fee70
...@@ -181,8 +181,8 @@ production: &base ...@@ -181,8 +181,8 @@ production: &base
user_filter: '' user_filter: ''
# LDAP attributes that GitLab will use to create an account for the LDAP user. # LDAP attributes that GitLab will use to create an account for the LDAP user.
# Can be either the name of an attribute as a string (e.g. 'mail'), # The specified attribute can either be the attribute name as a string (e.g. 'mail'),
# or an array of names of attributes to try in order (e.g. ['mail', 'email']). # or an array of attribute names to try in order (e.g. ['mail', 'email']).
# Note that the user's LDAP login will always be the attribute specified as `uid` above. # Note that the user's LDAP login will always be the attribute specified as `uid` above.
attributes: attributes:
# The username will be used in paths for the user's own projects # The username will be used in paths for the user's own projects
......
...@@ -78,6 +78,26 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server ...@@ -78,6 +78,26 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
# #
user_filter: '' user_filter: ''
# LDAP attributes that GitLab will use to create an account for the LDAP user.
# The specified attribute can either be the attribute name as a string (e.g. 'mail'),
# or an array of attribute names to try in order (e.g. ['mail', 'email']).
# Note that the user's LDAP login will always be the attribute specified as `uid` above.
attributes:
# The username will be used in paths for the user's own projects
# (like `gitlab.example.com/username/project`) and when mentioning
# them in issues, merge request and comments (like `@username`).
# If the attribute specified for `username` contains an email address,
# the GitLab username will be the part of the email address before the '@'.
username: ['uid', 'userid', 'sAMAccountName']
email: ['mail', 'email', 'userPrincipalName']
# If no full name could be found at the attribute specified for `name`,
# the full name is determined using the attributes specified for
# `first_name` and `last_name`.
name: 'cn'
first_name: 'givenName'
last_name: 'sn'
# GitLab EE only: add more LDAP servers # GitLab EE only: add more LDAP servers
# Choose an ID made of a-z and 0-9 . This ID will be stored in the database # Choose an ID made of a-z and 0-9 . This ID will be stored in the database
# so that GitLab can remember which LDAP server a user belongs to. # so that GitLab can remember which LDAP server a user belongs to.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment