Merge branch 'upload-to-cdn-servers'

Author: faern

ci/buildserver-config.sh

@@ -18,10 +18,10 @@ export SUPPORTED_DEB_CODENAMES
 
 export SUPPORTED_RPM_ARCHITECTURES=("x86_64" "aarch64")
 
-# Servers to upload Linux deb/rpm repositories to
-export DEV_LINUX_REPOSITORY_SERVERS=("se-got-cdn-001.devmole.eu" "se-got-cdn-002.devmole.eu")
-export STAGING_LINUX_REPOSITORY_SERVERS=("se-got-cdn-001.stagemole.eu" "se-got-cdn-002.stagemole.eu")
-export PRODUCTION_LINUX_REPOSITORY_SERVERS=("se-got-cdn-111.mullvad.net" "se-mma-cdn-101.mullvad.net")
+# Servers to upload Linux deb/rpm repositories and all other build artifacts to.
+export DEV_UPLOAD_SERVERS=("cdn.devmole.eu")
+export STAGING_UPLOAD_SERVERS=("cdn.stagemole.eu")
+export PRODUCTION_UPLOAD_SERVERS=("cdn.mullvad.net")
 
 export DEV_LINUX_REPOSITORY_PUBLIC_URL="https://repository.devmole.eu"
 export STAGING_LINUX_REPOSITORY_PUBLIC_URL="https://repository.stagemole.eu"

ci/buildserver-upload.sh

@@ -14,7 +14,10 @@ cd "$UPLOAD_DIR"
 function rsync_upload {
     local file=$1
     local upload_dir=$2
-    rsync -av --mkpath --rsh='ssh -p 1122' "$file" "upload-server-1:$upload_dir/"
+    for server in "${PRODUCTION_UPLOAD_SERVERS[@]}"; do
+        echo "Uploading $file to $server:$upload_dir"
+        rsync -av --mkpath --rsh='ssh -p 1122' "$file" "$server:$upload_dir/"
+    done
 }
 
 while true; do

ci/publish-linux-repositories.sh

@@ -14,15 +14,15 @@ source "$SCRIPT_DIR/buildserver-config.sh"
 while [ "$#" -gt 0 ]; do
     case "$1" in
         "--production")
-            repository_servers=("${PRODUCTION_LINUX_REPOSITORY_SERVERS[@]}")
+            repository_servers=("${PRODUCTION_UPLOAD_SERVERS[@]}")
             repository_server_url="$PRODUCTION_LINUX_REPOSITORY_PUBLIC_URL"
             ;;
         "--staging")
-            repository_servers=("${STAGING_LINUX_REPOSITORY_SERVERS[@]}")
+            repository_servers=("${STAGING_UPLOAD_SERVERS[@]}")
             repository_server_url="$STAGING_LINUX_REPOSITORY_PUBLIC_URL"
             ;;
         "--dev")
-            repository_servers=("${DEV_LINUX_REPOSITORY_SERVERS[@]}")
+            repository_servers=("${DEV_UPLOAD_SERVERS[@]}")
             repository_server_url="$DEV_LINUX_REPOSITORY_PUBLIC_URL"
             ;;
         "--deb")