X-Git-Url: http://git.onelab.eu/?p=myops.git;a=blobdiff_plain;f=web%2Fcollect%2Fclient%2Fupload.sh;h=dcff80193b5ed94abe8c1c21c7f72c659836b542;hp=064481cee34f2a3ac960f60d32fc5d16869feaae;hb=3ebc599db4bc491de0dd4195b2e6dc858dbd3d22;hpb=2c16b9ee5acc1b619824df8d4e4fb57c6a02dee7 diff --git a/web/collect/client/upload.sh b/web/collect/client/upload.sh index 064481c..dcff801 100644 --- a/web/collect/client/upload.sh +++ b/web/collect/client/upload.sh @@ -5,8 +5,8 @@ if [ -f /etc/planetlab/plc_config ]; then else PLC_SLICE_PREFIX='pl' fi -if [ -f /usr/boot/cacert.pem ] ; then - CURL_ARGS="$CURL_ARGS --cacert /usr/boot/cacert.pem" +if [ -f /usr/boot/myops_cacert.pem ] ; then + CURL_ARGS="$CURL_ARGS --cacert /usr/boot/myops_cacert.pem" else CURL_ARGS="$CURL_ARGS --insecure" fi @@ -33,7 +33,7 @@ function upload_log () #comm -1 -3 $old $new > $log cp $new $log if [ $( stat -c %s $log ) -ne 0 ] ; then - curl $CURL_ARGS --max-time 60 --silent https://${MYOPS_SERVER}/upload.php --form "log=@$log" + curl $CURL_ARGS --max-time 60 --silent https://${MYOPS_SERVER}/upload.php --form "namespace=${PLC_SLICE_PREFIX}" --form "log=@$log" if [ $? -ne 0 ] ; then # the upload has failed, so remove new file so no data is lost rm -f /tmp/$( basename $file ).new