use proxy cert in htproxy[...].
authorMarcel Poul <marcel.poul@cern.ch>
Sat, 10 Nov 2012 19:34:41 +0000 (19:34 +0000)
committerMarcel Poul <marcel.poul@cern.ch>
Sat, 10 Nov 2012 19:34:41 +0000 (19:34 +0000)
org.glite.testsuites.ctb/gridsite/tests/gridsite-test-all.sh

index abb04a5..ce608fc 100755 (executable)
@@ -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"