Changeset 2392

Show
Ignore:
Timestamp:
10/01/09 10:24:05
Author:
douglm
Message:

Fix up config so that ldap groups work

Add memberOf info to the header so we can see if anything is happening.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/default/cal.options.xml

    r2342 r2392  
    7272 
    7373            <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory> 
    74             <providerUrl>ldap://localhost/</providerUrl> 
     74            <providerUrl>ldap://localhost:10389</providerUrl> 
    7575            <groupContextDn>ou=groups, dc=bedework, dc=org</groupContextDn> 
    76             <groupMemberAttr>uniqueMember</groupMemberAttr> 
     76            <groupMemberAttr>member</groupMemberAttr> 
    7777            <userDnPrefix>uid=</userDnPrefix> 
    7878            <userDnSuffix>,ou=accounts, dc=bedework, dc=org</userDnSuffix> 
    7979            <groupDnPrefix>cn=</groupDnPrefix> 
    80             <groupDnSuffix>,ou=groups, dc=bedework, dc=org</groupDnSuffix> 
     80            <groupDnSuffix>,ou=groups,dc=bedework, dc=org</groupDnSuffix> 
    8181            <debug>true</debug> 
    8282 
    83             <!-- 
    8483            <securityAuthentication>simple</securityAuthentication> 
    8584            <securityProtocol>NONE</securityProtocol> 
    86             <authDn></authDn> 
    87             <authPw></authPw> 
    88              --> 
     85            <authDn>uid=admin,ou=system</authDn> 
     86            <authPw>secret</authPw> 
    8987          </user-ldap-group> 
    9088 
    …… 
    151149        <mailerClass>org.bedework.mail.DummyMailer</mailerClass> 
    152150        <admingroupsClass>org.bedework.calsvc.directory.AdminGroupsDbImpl</admingroupsClass> 
     151        <usergroupsClass>org.bedework.calsvc.directory.UserGroupsLdapImpl</usergroupsClass> 
    153152        <!-- 
    154         <usergroupsClass>org.bedework.calsvc.directory.UserGroupsLdapImpl</usergroupsClass> 
     153        <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    155154        --> 
    156         <usergroupsClass>org.bedework.calsvc.directory.GroupsDbImpl</usergroupsClass> 
    157155 
    158156        <directoryBrowsingDisallowed>true</directoryBrowsingDisallowed>