Explain new configuration options.
And add some advertisement to use GitLab EE
This commit is contained in:
parent
fedb223b09
commit
b4f7b387d0
|
@ -135,24 +135,13 @@ production: &base
|
||||||
ldap:
|
ldap:
|
||||||
enabled: false
|
enabled: false
|
||||||
servers:
|
servers:
|
||||||
## provider id
|
main: # 'main' is the GitLab 'provider ID' of this LDAP server
|
||||||
#
|
|
||||||
# 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
|
## label
|
||||||
#
|
#
|
||||||
# A human-friendly name for your LDAP server. It is OK to change the label later,
|
# 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.
|
# for instance if you find out it is too large to fit on the web page.
|
||||||
#
|
#
|
||||||
# Example: 'Paris' or 'Acme, Ltd.'
|
# Example: 'Paris' or 'Acme, Ltd.'
|
||||||
|
|
||||||
label: 'LDAP'
|
label: 'LDAP'
|
||||||
|
|
||||||
host: '_your_ldap_server'
|
host: '_your_ldap_server'
|
||||||
|
@ -193,6 +182,15 @@ production: &base
|
||||||
#
|
#
|
||||||
user_filter: ''
|
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 settings
|
||||||
omniauth:
|
omniauth:
|
||||||
# Allow login via Twitter, Google, etc. using OmniAuth providers
|
# Allow login via Twitter, Google, etc. using OmniAuth providers
|
||||||
|
|
Loading…
Reference in New Issue