Commit 4d7792bc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'explain_ldap_check' into 'master'

Improve the explanation of the LDAP check script
parents d435fbb9 af9a14c4
...@@ -116,8 +116,8 @@ production: &base ...@@ -116,8 +116,8 @@ production: &base
# ========================== # ==========================
## LDAP settings ## LDAP settings
# You can inspect the first 100 LDAP users with login access by running: # You can inspect a sample of the LDAP users with login access by running:
# bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production # bundle exec rake gitlab:ldap:check RAILS_ENV=production
ldap: ldap:
enabled: false enabled: false
host: '_your_ldap_server' host: '_your_ldap_server'
......
...@@ -682,6 +682,8 @@ namespace :gitlab do ...@@ -682,6 +682,8 @@ namespace :gitlab do
namespace :ldap do namespace :ldap do
task :check, [:limit] => :environment do |t, args| task :check, [:limit] => :environment do |t, args|
# Only show up to 100 results because LDAP directories can be very big.
# This setting only affects the `rake gitlab:check` script.
args.with_defaults(limit: 100) args.with_defaults(limit: 100)
warn_user_is_not_gitlab warn_user_is_not_gitlab
start_checking "LDAP" start_checking "LDAP"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment