Merge branch 'fix_ldap_config' into 'master'
Fix erroneous YAML spacing in LDAP configuration ## What does this MR do? Fix erroneous indentation in LDAP example configuration ## Are there points in the code the reviewer needs to double check? Is the indentation correct now? 😂 ## Why was this MR needed? Bad configs in docs suck. See merge request !4326
This commit is contained in:
commit
7144867326
|
@ -130,27 +130,27 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
|
||||||
first_name: 'givenName'
|
first_name: 'givenName'
|
||||||
last_name: 'sn'
|
last_name: 'sn'
|
||||||
|
|
||||||
## EE only
|
## EE only
|
||||||
|
|
||||||
# Base where we can search for groups
|
# Base where we can search for groups
|
||||||
#
|
#
|
||||||
# Ex. ou=groups,dc=gitlab,dc=example
|
# Ex. ou=groups,dc=gitlab,dc=example
|
||||||
#
|
#
|
||||||
group_base: ''
|
group_base: ''
|
||||||
|
|
||||||
# The CN of a group containing GitLab administrators
|
# The CN of a group containing GitLab administrators
|
||||||
#
|
#
|
||||||
# Ex. administrators
|
# Ex. administrators
|
||||||
#
|
#
|
||||||
# Note: Not `cn=administrators` or the full DN
|
# Note: Not `cn=administrators` or the full DN
|
||||||
#
|
#
|
||||||
admin_group: ''
|
admin_group: ''
|
||||||
|
|
||||||
# The LDAP attribute containing a user's public SSH key
|
# The LDAP attribute containing a user's public SSH key
|
||||||
#
|
#
|
||||||
# Ex. ssh_public_key
|
# Ex. ssh_public_key
|
||||||
#
|
#
|
||||||
sync_ssh_keys: false
|
sync_ssh_keys: false
|
||||||
|
|
||||||
# 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
|
||||||
|
|
Loading…
Reference in New Issue