From f5f25d94279f68c0d7edb18e6e3a7b82160b6a4b Mon Sep 17 00:00:00 2001
From: unknown <q16127@.ds.mot.com>
Date: Wed, 25 Jan 2012 17:23:30 +0900
Subject: Added LDAP related configuration items to EXTERNAL_KEYS for proper
 ldap configuration:

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_BASEDN',
        description=_('LDAP BASE DN')
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_SEARCH_SCOPE',
        description=_('LDAP Search Scope'),
        default="subs"
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_USERID_FIELD',
        description=_('LDAP Server USERID field name'),
        default="uid"
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_COMMONNAME_FIELD',
        description=_('LDAP Server "Common Name" field name'),
        default="cn"
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_EMAIL_FIELD',
        description=_('LDAP Server EMAIL field name'),
        default="mail"
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_PROXYDN',
        description=_('LDAP PROXY DN'),
        default=""
    )
)

settings.register(
    livesettings.StringValue(
        EXTERNAL_KEYS,
        'LDAP_PROXYDN_PASSWORD',
        description=_('LDAP PROXY DN Password'),
        defalut="",
    )
)
---
 askbot/conf/external_keys.py | 66 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 7 deletions(-)

diff --git a/askbot/conf/external_keys.py b/askbot/conf/external_keys.py
index a673534a..b333934f 100644
--- a/askbot/conf/external_keys.py
+++ b/askbot/conf/external_keys.py
@@ -53,6 +53,8 @@ settings.register(
     )
 )
 
+
+
 settings.register(
     livesettings.StringValue(
         EXTERNAL_KEYS,
@@ -170,26 +172,76 @@ settings.register(
     )
 )
 
+
+
 settings.register(
     livesettings.StringValue(
         EXTERNAL_KEYS,
-        'LDAP_PROVIDER_NAME',
-        description=_('LDAP service provider name')
+        'LDAP_URL',
+        description=_('LDAP URL'),
+        default="ldap://<host>:<port>"
     )
 )
 
+
 settings.register(
     livesettings.StringValue(
         EXTERNAL_KEYS,
-        'LDAP_URL',
-        description=_('URL for the LDAP service')
+        'LDAP_BASEDN',
+        description=_('LDAP BASE DN')
     )
 )
 
 settings.register(
-    livesettings.LongStringValue(
+    livesettings.StringValue(
         EXTERNAL_KEYS,
-        'HOW_TO_CHANGE_LDAP_PASSWORD',
-        description=_('Explain how to change LDAP password')
+        'LDAP_SEARCH_SCOPE',
+        description=_('LDAP Search Scope'),
+        default="subs"
     )
 )
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'LDAP_USERID_FIELD',
+        description=_('LDAP Server USERID field name'),
+        default="uid" 
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'LDAP_COMMONNAME_FIELD',
+        description=_('LDAP Server "Common Name" field name'),
+        default="cn"
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'LDAP_EMAIL_FIELD',
+        description=_('LDAP Server EMAIL field name'),
+        default="mail"
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'LDAP_PROXYDN',
+        description=_('LDAP PROXY DN'),
+        default=""
+    )
+)
+
+settings.register(
+    livesettings.StringValue(
+        EXTERNAL_KEYS,
+        'LDAP_PROXYDN_PASSWORD',
+        description=_('LDAP PROXY DN Password'),
+        defalut="",
+    )
+)
\ No newline at end of file
-- 
cgit v1.2.3-1-g7c22