diff -r c0b7687bce3d -r 329b4f6d18b4 server/sources/ldapuser.py --- a/server/sources/ldapuser.py Mon Apr 19 12:42:54 2010 +0200 +++ b/server/sources/ldapuser.py Mon Apr 19 12:43:23 2010 +0200 @@ -58,14 +58,14 @@ 'default': 'ldap', 'help': 'ldap host. It may contains port information using \ : notation.', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('protocol', {'type' : 'choice', 'default': 'ldap', 'choices': ('ldap', 'ldaps', 'ldapi'), 'help': 'ldap protocol (allowed values: ldap, ldaps, ldapi)', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('auth-mode', @@ -73,13 +73,13 @@ 'default': 'simple', 'choices': ('simple', 'cram_md5', 'digest_md5', 'gssapi'), 'help': 'authentication mode used to authenticate user to the ldap.', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('auth-realm', {'type' : 'string', 'default': None, 'help': 'realm to use when using gssapi/kerberos authentication.', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('data-cnx-dn', @@ -87,52 +87,52 @@ 'default': '', 'help': 'user dn to use to open data connection to the ldap (eg used \ to respond to rql queries).', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('data-cnx-password', {'type' : 'string', 'default': '', 'help': 'password to use to open data connection to the ldap (eg used to respond to rql queries).', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('user-base-dn', {'type' : 'string', 'default': 'ou=People,dc=logilab,dc=fr', 'help': 'base DN to lookup for users', - 'group': 'ldap-source', 'inputlevel': 0, + 'group': 'ldap-source', 'level': 0, }), ('user-scope', {'type' : 'choice', 'default': 'ONELEVEL', 'choices': ('BASE', 'ONELEVEL', 'SUBTREE'), 'help': 'user search scope', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('user-classes', {'type' : 'csv', 'default': ('top', 'posixAccount'), 'help': 'classes of user', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('user-login-attr', {'type' : 'string', 'default': 'uid', 'help': 'attribute used as login on authentication', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('user-default-group', {'type' : 'csv', 'default': ('users',), 'help': 'name of a group in which ldap users will be by default. \ You can set multiple groups by separating them by a comma.', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('user-attrs-map', {'type' : 'named', 'default': {'uid': 'login', 'gecos': 'email'}, 'help': 'map from ldap user attributes to cubicweb attributes', - 'group': 'ldap-source', 'inputlevel': 1, + 'group': 'ldap-source', 'level': 1, }), ('synchronization-interval', @@ -140,13 +140,13 @@ 'default': 24*60*60, 'help': 'interval between synchronization with the ldap \ directory (default to once a day).', - 'group': 'ldap-source', 'inputlevel': 2, + 'group': 'ldap-source', 'level': 2, }), ('cache-life-time', {'type' : 'int', 'default': 2*60, 'help': 'life time of query cache in minutes (default to two hours).', - 'group': 'ldap-source', 'inputlevel': 2, + 'group': 'ldap-source', 'level': 2, }), )