summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-22 11:11:18 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-10-22 11:12:46 +0300
commit4c034142a13c2e82e62b6f27a61e371b463310fb (patch)
tree7fbb8fbdefa0b65b1c55d0f6100c9750ad38cba8
parent37e09858e8f6dec949f004a933eef8346ddc97d4 (diff)
downloadgitlab-ce-4c034142a13c2e82e62b6f27a61e371b463310fb.tar.gz
Make gitlab ldap check work for old and new syntax
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--lib/tasks/gitlab/check.rake4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 707d236068e..56e8ff44988 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -676,11 +676,11 @@ namespace :gitlab do
def print_users(limit)
puts "LDAP users with access to your GitLab server (only showing the first #{limit} results)"
- servers = Gitlab.config.ldap.servers.keys
+ servers = Gitlab::LDAP::Config.providers
servers.each do |server|
puts "Server: #{server}"
- Gitlab::LDAP::Adapter.open("ldap#{server}") do |adapter|
+ Gitlab::LDAP::Adapter.open(server) do |adapter|
users = adapter.users(adapter.config.uid, '*', 100)
users.each do |user|
puts "\tDN: #{user.dn}\t #{adapter.config.uid}: #{user.uid}"