From 606ec02d906cf730ebce208d1bab337cf131b384 Mon Sep 17 00:00:00 2001 From: Marcel Poul Date: Sat, 10 Nov 2012 19:34:41 +0000 Subject: [PATCH] use proxy cert in htproxy[...]. --- org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh index abb04a5..ce608fc 100755 --- a/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh +++ b/org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh @@ -365,7 +365,7 @@ EOF chown $HTTPD_USER /var/www/proxycache #delegation - id=`htproxyput --cert ${UCERT} --key ${UKEY} --capath /etc/grid-security/certificates https://$(hostname -f)/gridsite-delegation.cgi` + id=`htproxyput --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} https://$(hostname -f)/gridsite-delegation.cgi` printf "id: $id" if [ $? -eq 0 -a -n "$id" ]; then test_done @@ -373,9 +373,9 @@ EOF test_failed fi - expiry=`htproxyunixtime --cert ${UCERT} --key ${UKEY} --capath /etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi` + expiry=`htproxyunixtime --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi` - newid=`htproxyrenew --cert ${UCERT} --key ${UKEY} --capath /etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi` + newid=`htproxyrenew --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi` printf "newid: $newid" if [ $? -eq 0 -a -n "$newid" ]; then test_done @@ -383,7 +383,7 @@ EOF test_failed fi - htproxydestroy --cert ${UCERT} --key ${UKEY} --capath /etc/grid-security/certificates --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi + htproxydestroy --cert ${UPROXY} --key ${UPROXY} --capath ${UPROXY} --delegation-id $id https://$(hostname -f)/gridsite-delegation.cgi printf "Test handling of VOMS .lsc files (Regression test for bug #39254 and #82023)\n" -- 1.8.2.3