Fix LDAP documentation and example config

7b5a96b5 · Michael Kozono · 0d52e59d · 7b5a96b5 · 7b5a96b5
Commit 7b5a96b5 authored Jul 31, 2017 by Michael Kozono
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

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

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