Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
b4f7b387
Commit
b4f7b387
authored
Oct 14, 2014
by
Jan-Willem van der Meer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Explain new configuration options.
And add some advertisement to use GitLab EE
parent
fedb223b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
12 deletions
+10
-12
config/gitlab.yml.example
config/gitlab.yml.example
+10
-12
No files found.
config/gitlab.yml.example
View file @
b4f7b387
...
@@ -135,24 +135,13 @@ production: &base
...
@@ -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
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment