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
Boxiang Sun
gitlab-ce
Commits
7b5a96b5
Commit
7b5a96b5
authored
Jul 31, 2017
by
Michael Kozono
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LDAP documentation and example config
parent
0d52e59d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
config/gitlab.yml.example
config/gitlab.yml.example
+1
-1
doc/administration/auth/ldap.md
doc/administration/auth/ldap.md
+3
-3
No files found.
config/gitlab.yml.example
View file @
7b5a96b5
...
@@ -282,7 +282,7 @@ production: &base
...
@@ -282,7 +282,7 @@ production: &base
#
#
# Example: '/etc/ca.pem'
# Example: '/etc/ca.pem'
#
#
ca_
cert
: ''
ca_
file
: ''
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# is not appropriate.
# is not appropriate.
...
...
doc/administration/auth/ldap.md
View file @
7b5a96b5
...
@@ -96,7 +96,7 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
...
@@ -96,7 +96,7 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server
#
#
# Example: '/etc/ca.pem'
# Example: '/etc/ca.pem'
#
#
ca_
cert
: ''
ca_
file
: ''
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# Specifies the SSL version for OpenSSL to use, if the OpenSSL default
# is not appropriate.
# is not appropriate.
...
@@ -259,9 +259,9 @@ group you can use the following syntax:
...
@@ -259,9 +259,9 @@ group you can use the following syntax:
(memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
(memberOf:1.2.840.113556.1.4.1941:=CN=My Group,DC=Example,DC=com)
```
```
Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at
Find more information about this "LDAP_MATCHING_RULE_IN_CHAIN" filter at
https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
https://msdn.microsoft.com/en-us/library/aa746475(v=vs.85).aspx. Support for
nested members in the user filter should not be confused with
nested members in the user filter should not be confused with
[
group sync nested groups support (EE only)
](
https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes
)
.
[
group sync nested groups support (EE only)
](
https://docs.gitlab.com/ee/administration/auth/ldap-ee.html#supported-ldap-group-types-attributes
)
.
Please note that GitLab does not support the custom filter syntax used by
Please note that GitLab does not support the custom filter syntax used by
...
...
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