From 0e44acbb2fec928a1606dc60f427a148fff405c9 Mon Sep 17 00:00:00 2001 From: Mohamed Ragab <moragab@gmail.com> Date: Wed, 02 May 2012 11:15:01 -0400 Subject: [PATCH] Added a script to facilitate setting the proxy host and port and no proxy hosts, and then it concatenates all the java system properties for setting the java proxy configurations and puts the resulting string in an environment variable JAVA_PROXY_CONFIG, modified the scirpts gitblit, gitblit-ubuntu, and gitblit-centos to source the java-proxy-config.sh script and then include the resulting java proxy configuration in the java command --- tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif b/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif index 22d6869..df79333 100644 --- a/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif +++ b/tests/com/gitblit/tests/resources/ldapUserServiceSampleData.ldif @@ -25,6 +25,13 @@ sAMAccountName: Git_Admins member: CN=UserOne,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain +dn: CN=Git Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain +objectClass: top +objectClass: group +cn: Git Admins +sAMAccountName: Git_Admins_With_Space +member: CN=UserTwo,OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain + dn: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain objectClass: top objectClass: group @@ -55,6 +62,11 @@ objectClass: person sAMAccountName: UserOne userPassword: userOnePassword +displayName: User One +givenName: User +surname: One +personalTitle: Mr +email: userone@gitblit.com memberOf: CN=Git_Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain @@ -63,13 +75,24 @@ objectClass: person sAMAccountName: UserTwo userPassword: userTwoPassword +displayName: User Two +givenName: User +surname: Two +personalTitle: Mr +email: usertwo@gitblit.com memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain +memberOf: CN=Git Admins,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain dn: CN=UserThree,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain objectClass: user objectClass: person sAMAccountName: UserThree userPassword: userThreePassword +displayName: User Three +givenName: User +surname: Three +personalTitle: Mrs +email: userthree@gitblit.com memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain dn: CN=UserFour,OU=Canada,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain @@ -77,4 +100,9 @@ objectClass: person sAMAccountName: UserFour userPassword: userFourPassword +displayName: User Four +givenName: User +surname: Four +personalTitle: Miss +email: userfour@gitblit.com memberOf: CN=Git_Users,OU=Groups,OU=UserControl,OU=MyOrganization,DC=MyDomain \ No newline at end of file -- Gitblit v1.9.1