diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-01 07:25:38 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-01 07:25:38 +0000 |
| commit | cfa41e624cdfe27a7ac0338d5098c8e9566f51c6 (patch) | |
| tree | 1cfcccbfcc11ccac7d56af594aa715fe5d71758b /doc | |
| parent | faa2a123911eaf84bb57163ea7af759d4632601b (diff) | |
| parent | 7b5a96b53c801d7fabef529481a525f3ab2ed2e3 (diff) | |
| download | gitlab-ce-cfa41e624cdfe27a7ac0338d5098c8e9566f51c6.tar.gz | |
Merge branch 'mk-fix-ldap-ca-file-docs' into 'master'
Fix LDAP documentation and example config
Closes #35770
See merge request !13196
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/auth/ldap.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index a7395e03d1c..425c924cdf2 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -96,7 +96,7 @@ main: # 'main' is the GitLab 'provider ID' of this LDAP server # # Example: '/etc/ca.pem' # - ca_cert: '' + ca_file: '' # Specifies the SSL version for OpenSSL to use, if the OpenSSL default # 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) ``` -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 -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). Please note that GitLab does not support the custom filter syntax used by |