Merge branch 'explain_ldap_check' into 'master'
Improve the explanation of the LDAP check script
This commit is contained in:
commit
4d7792bc38
2 changed files with 4 additions and 2 deletions
|
@ -116,8 +116,8 @@ production: &base
|
|||
# ==========================
|
||||
|
||||
## LDAP settings
|
||||
# You can inspect the first 100 LDAP users with login access by running:
|
||||
# bundle exec rake gitlab:ldap:check[100] RAILS_ENV=production
|
||||
# You can inspect a sample of the LDAP users with login access by running:
|
||||
# bundle exec rake gitlab:ldap:check RAILS_ENV=production
|
||||
ldap:
|
||||
enabled: false
|
||||
host: '_your_ldap_server'
|
||||
|
|
|
@ -682,6 +682,8 @@ namespace :gitlab do
|
|||
|
||||
namespace :ldap do
|
||||
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)
|
||||
warn_user_is_not_gitlab
|
||||
start_checking "LDAP"
|
||||
|
|
Loading…
Reference in a new issue