kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix LDAP documentation and example config

Browse source
This commit is contained in:
Michael Kozono 2017-07-31 08:43:27 -07:00
parent 0d52e59de4
commit 7b5a96b53c
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/gitlab.yml.example
View file

@ -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.

6
doc/administration/auth/ldap.md
View file

@ -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:
(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