mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-18 02:42:54 +09:00
bug #1321: Make use of https when registering images. Changed as proposed by SZTAKI LPDS
This commit is contained in:
1 parent
bea842b48c
commit
a62fd48e00
5 files changed
+6
-6
No files matched your search
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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=$?
|
||||
;;
|
||||
*)
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user