diff options
| author | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 15:03:53 +0200 |
|---|---|---|
| committer | Jan-Willem van der Meer <mail@jewilmeer.nl> | 2014-10-14 15:03:53 +0200 |
| commit | b4f7b387d0dfaef1766a82040249abb933632930 (patch) | |
| tree | b76d9da7d8895205681953942c7c70a6da674050 /config | |
| parent | fedb223b09f001f0a977c9d89130459c417347f2 (diff) | |
| download | gitlab-ce-b4f7b387d0dfaef1766a82040249abb933632930.tar.gz | |
Explain new configuration options.
And add some advertisement to use GitLab EE
Diffstat (limited to 'config')
| -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 4094cbc3eb4..260e8c85457 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -135,24 +135,13 @@ 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' - main: - + main: # 'main' is the GitLab 'provider ID' of this LDAP server ## label # # A human-friendly name for your LDAP server. It is OK to change the label later, # for instance if you find out it is too large to fit on the web page. # # Example: 'Paris' or 'Acme, Ltd.' - label: 'LDAP' host: '_your_ldap_server' @@ -193,6 +182,15 @@ production: &base # user_filter: '' + # 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 + # so that GitLab can remember which LDAP server a user belongs to. + # uswest2: + # label: + # host: + # .... + + ## OmniAuth settings omniauth: # Allow login via Twitter, Google, etc. using OmniAuth providers |