Add config changes for mutliple LDAP support (EE only)
This commit is contained in:
parent
a7e071e982
commit
3cd5abf635
|
@ -134,6 +134,29 @@ production: &base
|
||||||
# bundle exec rake gitlab:ldap:check RAILS_ENV=production
|
# bundle exec rake gitlab:ldap:check RAILS_ENV=production
|
||||||
ldap:
|
ldap:
|
||||||
enabled: false
|
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
|
||||||
|
|
||||||
|
## 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'
|
host: '_your_ldap_server'
|
||||||
port: 636
|
port: 636
|
||||||
uid: 'sAMAccountName'
|
uid: 'sAMAccountName'
|
||||||
|
@ -172,7 +195,6 @@ production: &base
|
||||||
#
|
#
|
||||||
user_filter: ''
|
user_filter: ''
|
||||||
|
|
||||||
|
|
||||||
## OmniAuth settings
|
## OmniAuth settings
|
||||||
omniauth:
|
omniauth:
|
||||||
# Allow login via Twitter, Google, etc. using OmniAuth providers
|
# Allow login via Twitter, Google, etc. using OmniAuth providers
|
||||||
|
@ -299,6 +321,21 @@ test:
|
||||||
project_url: "http://redmine/projects/:issues_tracker_id"
|
project_url: "http://redmine/projects/:issues_tracker_id"
|
||||||
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
|
issues_url: "http://redmine/:project_id/:issues_tracker_id/:id"
|
||||||
new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
|
new_issue_url: "http://redmine/projects/:issues_tracker_id/issues/new"
|
||||||
|
ldap:
|
||||||
|
enabled: false
|
||||||
|
servers:
|
||||||
|
-
|
||||||
|
provider_id: main
|
||||||
|
label: ldap
|
||||||
|
host: 127.0.0.1
|
||||||
|
port: 3890
|
||||||
|
uid: 'uid'
|
||||||
|
method: 'plain' # "tls" or "ssl" or "plain"
|
||||||
|
base: 'dc=example,dc=com'
|
||||||
|
user_filter: ''
|
||||||
|
group_base: 'ou=groups,dc=example,dc=com'
|
||||||
|
admin_group: ''
|
||||||
|
sync_ssh_keys: false
|
||||||
|
|
||||||
staging:
|
staging:
|
||||||
<<: *base
|
<<: *base
|
||||||
|
|
Loading…
Reference in New Issue