diff options
author | Drew Blessing <drew@blessing.io> | 2016-07-06 20:51:30 +0300 |
---|---|---|
committer | Drew Blessing <drew@blessing.io> | 2016-07-06 20:51:30 +0300 |
commit | 71448673264efc8c6e74267295eff81331fd7f0e (patch) | |
tree | be6e782c1652468f2ae3d06e414e0c441c8d4c63 /doc | |
parent | 8e5bf1573249be4a31ff8b4d575ed7665a0bfd77 (diff) | |
parent | 900a488f99a6050ebd01f00292d5dae98b11ad3a (diff) |
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? :joy:
## Why was this MR needed?
Bad configs in docs suck.
See merge request !4326
Diffstat (limited to 'doc')
-rw-r--r-- | doc/administration/auth/ldap.md | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 10096779844..7186f707ad6 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -130,27 +130,27 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server first_name: 'givenName' last_name: 'sn' - ## EE only - - # Base where we can search for groups - # - # Ex. ou=groups,dc=gitlab,dc=example - # - group_base: '' - - # The CN of a group containing GitLab administrators - # - # Ex. administrators - # - # Note: Not `cn=administrators` or the full DN - # - admin_group: '' - - # The LDAP attribute containing a user's public SSH key - # - # Ex. ssh_public_key - # - sync_ssh_keys: false + ## EE only + + # Base where we can search for groups + # + # Ex. ou=groups,dc=gitlab,dc=example + # + group_base: '' + + # The CN of a group containing GitLab administrators + # + # Ex. administrators + # + # Note: Not `cn=administrators` or the full DN + # + admin_group: '' + + # The LDAP attribute containing a user's public SSH key + # + # Ex. ssh_public_key + # + sync_ssh_keys: false # 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 |