Skip to content

Update LDAP SSL settings

Michael Kozono requested to merge update-ldap-ssl-settings into master

Warning

This must be merged at the same time as https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2115/. It is planned to be released with GitLab 9.4.

Why was this needed?

https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2115/

  • ca_cert and ssl_version options were added
  • method was renamed to encryption
  • Encryption method values ssl and tls were renamed for clarity.

Notes

I didn't modify default.rb because it doesn't make sense to have a default LDAP server configuration (and there isn't already one that I could add to).

Also, the main example configuration in the doc specifies no encryption (as it should), so I didn't add the new SSL options to the example. The example comment already links to gitlab.yml.example, which describes the SSL options.

However, I am open to syncing this example with gitlab.yml.example (there are other keys missing from this doc). Thoughts?

Edited by GitLab Release Tools Bot

Merge request reports