From a62060b1de558dc61b7f1df63bbe8d7ffeeec632 Mon Sep 17 00:00:00 2001
From: Karen Carias <karen@gitlab.com>
Date: Fri, 24 Apr 2015 02:19:21 +0000
Subject: [PATCH] Added " How to maintain tight control over the number of
 active users on your GitLab installation" to documentation

---
 doc/raketasks/user_management.md | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/doc/raketasks/user_management.md b/doc/raketasks/user_management.md
index 80b01ca4043..04a8126c161 100644
--- a/doc/raketasks/user_management.md
+++ b/doc/raketasks/user_management.md
@@ -47,3 +47,38 @@ sudo gitlab-rake gitlab:import:all_users_to_all_groups
 # installation from source
 bundle exec rake gitlab:import:all_users_to_all_groups RAILS_ENV=production
 ```
+
+## Maintain tight control over the number of active users on your GitLab installation
+
+- Enable this setting to keep new users blocked until they have been cleared by the admin 
+
+```bash
+(default: false).
+block_auto_created_users: false
+
+Base where we can search for users
+
+Ex. ou=People,dc=gitlab,dc=example
+
+base: ''
+
+Filter LDAP users
+
+Format: RFC 4515 http://tools.ietf.org/search/rfc4515
+Ex. (employeeType=developer)
+
+Note: GitLab does not support omniauth-ldap's custom filter syntax.
+
+user_filter: ''
+```
+
+- GitLab EE only: add more LDAP servers
+
+```bash
+Choose an ID made of a-z and 0-9 . This ID will be stored in the database
+so that GitLab can remember which LDAP server a user belongs to.
+uswest2:
+label:
+host:
+....
+```
\ No newline at end of file