From ce4d8c3ce5642c20766c82f6e5ea5deb7fc41d53 Mon Sep 17 00:00:00 2001 From: Drew Blessing Date: Wed, 28 Sep 2016 00:13:10 -0500 Subject: [PATCH] Add LDAP failover support --- config/initializers/devise.rb | 5 ++++- lib/gitlab/ldap/config.rb | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index a0a8f88584c3..9164f5cbf0b1 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -220,11 +220,14 @@ email_stripping_proc = ->(name) {name} end + host_pairs = server['hosts'].map { |host| host.split(':') } if server['hosts'] + config.omniauth server['provider_name'], + hosts: host_pairs, host: server['host'], + port: server['port'], base: server['base'], uid: server['uid'], - port: server['port'], method: server['method'], bind_dn: server['bind_dn'], password: server['password'], diff --git a/lib/gitlab/ldap/config.rb b/lib/gitlab/ldap/config.rb index f9bb57753230..29b16d942904 100644 --- a/lib/gitlab/ldap/config.rb +++ b/lib/gitlab/ldap/config.rb @@ -38,7 +38,10 @@ def enabled? end def adapter_options + host_pairs = server['hosts'].map { |host| host.split(':') } + { + hosts: host_pairs, host: options['host'], port: options['port'], encryption: encryption -- GitLab