Skip to content

Commit

Permalink
Explain new configuration options.
Browse files Browse the repository at this point in the history
And add some advertisement to use GitLab EE
  • Loading branch information
jewilmeer committed Oct 14, 2014
1 parent fedb223 commit b4f7b38
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions config/gitlab.yml.example
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b4f7b38

Please sign in to comment.