Added simplified ConfFile entry using myops_setup_sh

[myops.git] / web / collect / client / upload.sh

diff --git a/web/collect/client/upload.sh b/web/collect/client/upload.sh
index 02b7c5e..064481c 100644 (file)
--- a/web/collect/client/upload.sh
+++ b/web/collect/client/upload.sh
@@ -1,20 +1,15 @@
 #!/bin/bash
 
-#if [ -f /tmp/source/configuration ] ; then
-#    source /tmp/source/configuration
-#elif [ -f /etc/planetlab/plc_config ] ; then
-#    source /etc/planetlab/plc_config
-#else 
-#      PLC_MONITOR_HOST=IPADDR
-#fi
-#if [[ -z "$PLC_MONITOR_HOST" || "$PLC_MONITOR_HOST" = "localhost.localdomain" ]] ; then
-#    PLC_MONITOR_HOST=monitor.planet-lab.org
-#fi
 if [ -f /etc/planetlab/plc_config ]; then
        source /etc/planetlab/plc_config
 else
        PLC_SLICE_PREFIX='pl'
 fi
+if [ -f /usr/boot/cacert.pem ] ; then
+       CURL_ARGS="$CURL_ARGS --cacert /usr/boot/cacert.pem"
+else
+       CURL_ARGS="$CURL_ARGS --insecure"
+fi
 
 export MYOPS_SERVER=IPADDR
 
@@ -38,7 +33,7 @@ function upload_log ()
     #comm -1 -3 $old $new > $log
     cp $new $log
     if [ $( stat -c %s $log ) -ne 0 ] ; then
-        curl --max-time 60 --silent http://${MYOPS_SERVER}/upload.php --form "log=@$log"
+        curl $CURL_ARGS --max-time 60 --silent https://${MYOPS_SERVER}/upload.php --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