Merge pull request #6 from Kinto/3-default-settings

Set default value for multiauth.policy.ldap.use (fixes #3)
Kinto · Jul 26, 2016 · bc0d615 · bc0d615
2 parents 8d31fe0 + db94d46
commit bc0d615
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -7,7 +7,7 @@ This document describes changes between each past release.
 0.2.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Set default value for ``multiauth.policy.ldap.use`` (fixes #3)
 
 
 0.1.0 (2016-06-27)

diff --git a/README.rst b/README.rst
@@ -23,7 +23,7 @@ Before installing you will need the following system dependencies:
 On Debian based systems::
 
     sudo apt-get install libsasl2-dev python-dev libldap2-dev libssl-dev
-    
+
 On RPM based systems::
 
     sudo yum install openldap-devel openssl-devel python-devel
@@ -50,16 +50,13 @@ And configure authentication policy using `pyramid_multiauth
 ::
 
     multiauth.policies = ldap
-    multiauth.policy.ldap.use = kinto_ldap.authentication.LDAPBasicAuthAuthenticationPolicy
 
 By default, it will rely on the cache configured in *Kinto*.
 
 
 Configuration
 -------------
 
-Fill those settings with the values obtained during the application registration:
-
 ::
 
     # ldap.cache_ttl_seconds = 30
@@ -72,3 +69,4 @@ If necessary, override default values for authentication policy:
 ::
 
     # multiauth.policy.ldap.realm = Realm
+    # multiauth.policy.ldap.use = kinto_ldap.authentication.LDAPBasicAuthAuthenticationPolicy
diff --git a/kinto_ldap/__init__.py b/kinto_ldap/__init__.py
@@ -5,6 +5,8 @@
 
 
 DEFAULT_SETTINGS = {
+    'multiauth.policy.ldap.use': ('kinto_ldap.authentication.'
+                                  'LDAPBasicAuthAuthenticationPolicy'),
     'ldap.cache_ttl_seconds': 30,
     'ldap.endpoint': 'ldap://ldap.db.scl3.mozilla.com',
     'ldap.fqn': 'mail={mail},o=com,dc=mozilla',