Bug 891708 - fix parameters in example LDAP config file; r=telliott
authorRyan Kelly <rfkelly@mozilla.com>
Thu, 11 Jul 2013 08:46:35 +1000
changeset 547 ce11b2327fbc
parent 546 528ff5e44486
child 548 1eda02b4816d
push id127
push userrkelly@mozilla.com
push date2013-07-10 22:46 +0000
reviewerstelliott
bugs891708
Bug 891708 - fix parameters in example LDAP config file; r=telliott
etc/memcachedldap.conf
--- a/etc/memcachedldap.conf
+++ b/etc/memcachedldap.conf
@@ -46,49 +46,30 @@ pool_recycle = 3600
 [auth]
 # backend used for the auth
 backend = services.user.mozilla_ldap.LDAPUser
 
 # location of the ldap server
 ldapuri = ldap://localhost:390
 
 # maximum time in secondes allowed for a LDAP query. -1 = no timeout
-ldap_timeout =  -1
+ldap_timeout = -1
 
 # if set to true, initiates a tls
 use_tls = false
 
-# user for common ldap operation
-bind_user = "cn=admin,dc=mozilla"
-bind_password = admin
-
-# user with extended rights for write operations
-admin_user = "cn=admin,dc=mozilla"
-admin_password = admin
+# user for all ldap operations
+bind = "cn=admin,dc=mozilla"
+passwd = admin
 
 # root for all the users
-# if set to "md5", will generate a specific location
-# based on the hash of the user name so users are
-# spread across several nodes.
-#
-# otherwise, all users will be under the same node
 users_root = "ou=users,dc=mozilla"
 
-# uri for the DB. see RFC-1738
-#   driver://username:password@host:port/database
-#
-# supported drivers: sqlite, postgres, oracle, mssql, mysql, firebird
-#
-# SQL is used for the reset codes
-sqluri = mysql://sync:sync@localhost/sync
-pool_size = 100
-pool_recycle = 3600
-
-# cache server used by the ldap connector
-cache_servers = 127.0.0.1:11211
+# root to search from when allocating new user ids
+search_root = "dc=mozilla"
 
 # Uncomment the next line to disable creation of new user accounts.
 #allow_new_users = false
 
 [nodes]
 # You must set this to your client-visible server URL.
 # fallback_node = http://example.com/path/to/sync