diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 13:11:53 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 13:13:59 +0200 |
| commit | 6ce65a3e950532e8fb65cf188eb5df9a6eddfb39 (patch) | |
| tree | ace2949d72914b88506691910b940588db0f2e81 /config/gitlab.yml.example | |
| parent | 9bf7bfda20a466b375a459b95068de8c0139fc9a (diff) | |
| download | gitlab-ce-6ce65a3e950532e8fb65cf188eb5df9a6eddfb39.tar.gz | |
Use Hash syntax for LDAP server declaration
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 9302dca4ed8..59bd1442994 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -135,18 +135,16 @@ production: &base ldap: enabled: false servers: - - - ## provider_id - # - # This identifier is used by GitLab to keep track of which LDAP server each - # GitLab user belongs to. Each LDAP server known to GitLab should have a unique - # provider_id. This identifier cannot be changed once users from the LDAP server - # have started logging in to GitLab. - # - # Format: one word, using a-z (lower case) and 0-9 - # Example: 'paris' or 'uswest2' - - provider_id: main + ## provider id + # + # This identifier is used by GitLab to keep track of which LDAP server each + # GitLab user belongs to. Each LDAP server known to GitLab should have a unique + # provider id. This identifier cannot be changed once users from the LDAP server + # have started logging in to GitLab. + # + # Format: one word, using a-z (lower case) and 0-9 + # Example: 'paris' or 'uswest2' + main: ## label # |