diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-01 07:25:38 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-08-11 20:14:41 +0100 |
| commit | d1b06cbef8d7adda70f556eb5979256616335c64 (patch) | |
| tree | 6d726bb819bc5360a4431645ae99ca359e5d4e6c | |
| parent | 2a345b07e92870e129c51d2063db1c60efac95ca (diff) | |
| download | gitlab-ce-d1b06cbef8d7adda70f556eb5979256616335c64.tar.gz | |
Merge branch 'mk-fix-ldap-ca-file-docs' into 'master'
Fix LDAP documentation and example config
Closes #35770
See merge request !13196
| -rw-r--r-- | config/gitlab.yml.example | 2 | ||||
| -rw-r--r-- | doc/administration/auth/ldap.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 8b977cf481e..b67c2ed9335 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -282,7 +282,7 @@ production: &base # # Example: '/etc/ca.pem' # - ca_cert: '' + ca_file: '' # Specifies the SSL version for OpenSSL to use, if the OpenSSL default # is not appropriate. diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index 8ff59ee652c..2eb59580b08 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. |