diff options
| author | Alfred Schmid <A.Schmid@ff-muenchen.de> | 2014-01-31 12:29:55 +0100 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-02-19 11:04:16 -0500 |
| commit | eb1264b0944cfc0ac951c62239cc5a85428088e0 (patch) | |
| tree | f7662b0a64e85c47de68daf3a2f0e7abd44470e5 /src/test/resources | |
| parent | b2775fefaafb0ce89094bdd4bb5308dbb90f487b (diff) | |
| download | gitblit-eb1264b0944cfc0ac951c62239cc5a85428088e0.tar.gz gitblit-eb1264b0944cfc0ac951c62239cc5a85428088e0.zip | |
Basic implementation of feature for ldap user synchronization as
background service. Introduced configuration property to configure the
synchronization period.
Diffstat (limited to 'src/test/resources')
| -rw-r--r-- | src/test/resources/ldap/adduser.ldif | 11 | ||||
| -rw-r--r-- | src/test/resources/ldap/users.conf | 19 |
2 files changed, 28 insertions, 2 deletions
diff --git a/src/test/resources/ldap/adduser.ldif b/src/test/resources/ldap/adduser.ldif new file mode 100644 index 00000000..e7e3520b --- /dev/null +++ b/src/test/resources/ldap/adduser.ldif @@ -0,0 +1,11 @@ +dn: CN=UserFive,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain +objectClass: user +objectClass: person +sAMAccountName: UserFive +userPassword: userFivePassword +displayName: User Five +givenName: User +surname: Five +personalTitle: Miss +email: userfive@gitblit.com +memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain
\ No newline at end of file diff --git a/src/test/resources/ldap/users.conf b/src/test/resources/ldap/users.conf index b4b4a6ea..7d1e3197 100644 --- a/src/test/resources/ldap/users.conf +++ b/src/test/resources/ldap/users.conf @@ -7,10 +7,17 @@ [user "userthree"] password = "#externalAccount" cookie = d7d3894fc517612aa6c595555b6e1ab8e147e597 - displayName = User Three + displayName = Mrs. User Three emailAddress = userthree@gitblit.com accountType = LDAP role = "#admin" +[user "userfive"] + password = "#externalAccount" + cookie = 220bafef069b8b399b2597644015b6b0f4667982 + displayName = Miss. User Five + emailAddress = userfive@gitblit.com + accountType = LDAP + role = "#none" [user "userone"] password = "#externalAccount" cookie = c97cd38e50858cd0b389ec61b18fb9a89b4da54c @@ -21,7 +28,7 @@ [user "usertwo"] password = "#externalAccount" cookie = 498ca9bd2841d39050fa45d1d737b9f9f767858d - displayName = User Two + displayName = Mr. User Two emailAddress = usertwo@gitblit.com accountType = LDAP role = "#admin" @@ -37,6 +44,13 @@ cookie = dd94709528bb1c83d08f3088d4043f4742891f4f accountType = LOCAL role = "#create" +[user "userfour"] + password = "#externalAccount" + cookie = d4fca47ebc70f0495947f8b6158ac6edb546e2fe + displayName = Miss. User Four + emailAddress = userfour@gitblit.com + accountType = LDAP + role = "#none" [team "Git_Admins"] role = "#none" accountType = LOCAL @@ -47,6 +61,7 @@ user = userone user = usertwo user = userthree + user = userfour [team "Git Admins"] role = "#none" accountType = LOCAL |