shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

bug #1321: Make use of https when registering images. Changed as proposed by SZTAKI LPDS

Browse Source 
(cherry picked from commit a62fd48e00a7ff43665ded28607fb9530b321d38)
This commit is contained in:
Ruben S. Montero 2012-06-28 17:07:29 +02:00
parent 68adb07f38
commit 986e7966dd
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datastore_mad/remotes/fs/cp
View File

@ -83,7 +83,7 @@ COPY_COMMAND="$UTILS_PATH/downloader.sh $HASHES $SRC $DST"
# ------------ Copy the image to the repository -------------
case $SRC in
http://*)
http://*|https://*)
log "Downloading $SRC to the image repository"
exec_and_log "$COPY_COMMAND" "Error downloading $SRC"

2
src/datastore_mad/remotes/iscsi/cp
View File

@ -104,7 +104,7 @@ fi
COPY_COMMAND="$UTILS_PATH/downloader.sh $HASHES $SRC -"
case $SRC in
http://*)
http://*|https://*)
log "Downloading $SRC to the image repository"
DUMP="$COPY_COMMAND"

4
src/datastore_mad/remotes/libfs.sh
View File

@ -91,8 +91,8 @@ EOF
function fs_size {
case $1 in
http://*)
SIZE=`wget -S --spider $1 2>&1 | grep Content-Length | cut -d':' -f2`
http://*|https://*)
SIZE=`wget -S --spider --no-check-certificate $1 2>&1 | grep Content-Length | cut -d':' -f2`
error=$?
;;
*)

2
src/datastore_mad/remotes/lvm/cp
View File

@ -93,7 +93,7 @@ fi
COPY_COMMAND="$UTILS_PATH/downloader.sh $HASHES $SRC -"
case $SRC in
http://*)
http://*|https://*)
log "Downloading $SRC to the image repository"
DUMP="$COPY_COMMAND"

2
src/datastore_mad/remotes/vmware/cp
View File

@ -83,7 +83,7 @@ COPY_COMMAND="$UTILS_PATH/downloader.sh $HASHES $SRC $DST"
# ------------ Copy the image to the repository -------------
case $SRC in
http://*)
http://*|https://* )
log "Downloading $SRC to the image repository"
exec_and_log "$COPY_COMMAND" "Error downloading $SRC"