Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Kozono <mkozono@gmail.com>2017-06-06 21:16:17 +0300
committerMichael Kozono <mkozono@gmail.com>2017-07-26 12:43:32 +0300
commit6dbff9663de072279bd027e8e3e453b732f75977 (patch)
tree4f6ffeded383dc6df05a0f26f9cf5edd0fae3544 /config/initializers
parent8ab29d569e8c0019bbe458dea6f05a9894f0711a (diff)
Add LDAP config options
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/1_settings.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index ec7ce51b542..9344a42540b 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -145,6 +145,11 @@ if Settings.ldap['enabled'] || Rails.env.test?
server['attributes'] = {} if server['attributes'].nil?
server['provider_name'] ||= "ldap#{key}".downcase
server['provider_class'] = OmniAuth::Utils.camelize(server['provider_name'])
+ server['encryption'] ||= server['method'] # for backwards compatibility
+
+ # Certificates are not verified for backwards compatibility.
+ # This default should be flipped to true in 9.5.
+ server['verify_certificates'] = false if server['verify_certificates'].nil?
end
end