From 2cc3e11ac7e91a33cc4268607f3c7d2d19179f8a Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 25 Jul 2024 13:52:12 -0700 Subject: [PATCH] main: fix CDN url --- app/Actions/Server/UpdateCoolify.php | 2 +- scripts/install.sh | 8 ++++++-- scripts/upgrade.sh | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Actions/Server/UpdateCoolify.php b/app/Actions/Server/UpdateCoolify.php index a1072fa5f..025c0c884 100644 --- a/app/Actions/Server/UpdateCoolify.php +++ b/app/Actions/Server/UpdateCoolify.php @@ -57,7 +57,7 @@ private function update() } else { ray('Running update on production server'); remote_process([ - "curl -fsSL https://githaven.org/Shiloh/lasthourcloud/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh", + "curl -fsSL https://githaven.org/Shiloh/lasthourcloud/src/branch/main/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh", "bash /data/coolify/source/upgrade.sh $this->latestVersion" ], $this->server); diff --git a/scripts/install.sh b/scripts/install.sh index 94b1d8c3b..afc02e39f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -8,7 +8,7 @@ set -o pipefail # Cause a pipeline to return the status of the last command that VERSION="1.3.3" DOCKER_VERSION="26.0" -CDN="https://githaven.org/Shiloh/lasthourcloud" +CDN="https://githaven.org/Shiloh/lasthourcloud/src/branch/main/" OS_TYPE=$(grep -w "ID" /etc/os-release | cut -d "=" -f 2 | tr -d '"') # Check if the OS is manjaro, if so, change it to arch @@ -69,10 +69,14 @@ echo -e "-------------" echo -e "Welcome to Last Hour Cloud v4 beta installer!" echo -e "This script will install everything for you." <<<<<<< HEAD +<<<<<<< HEAD echo -e "(Source code: https://github.com/coollabsio/coolify/blob/main/scripts/install.sh )\n" ======= echo -e "(Source code: https://https://githaven.org/Shiloh/lasthourcloud/blob/main/scripts/install.sh)\n" >>>>>>> 35700ec24 (main: begin major rewrite for lasthour) +======= +echo -e "(Source code: https://githaven.org/Shiloh/lasthourcloud/src/branch/main/scripts/install.sh)\n" +>>>>>>> 4e89beaf1 (main: fix CDN url) echo -e "-------------" echo "OS: $OS_TYPE $OS_VERSION" @@ -287,7 +291,7 @@ echo "Downloading required files from CDN..." curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml curl -fsSL $CDN/.env.production -o /data/coolify/source/.env.production -curl -fsSL $CDN/upgrade.sh -o /data/coolify/source/upgrade.sh +curl -fsSL $CDN/scripts/upgrade.sh -o /data/coolify/source/upgrade.sh # echo "Copying required files from Last Hour Cloud git repo..." # cp /home/lasthour/lasthourcloud/docker-compose.yml /data/coolify/source/docker-compose.yml diff --git a/scripts/upgrade.sh b/scripts/upgrade.sh index ae5c03c57..958fe2c90 100644 --- a/scripts/upgrade.sh +++ b/scripts/upgrade.sh @@ -2,7 +2,7 @@ ## Do not modify this file. You will lose the ability to autoupdate! VERSION="1.0.5" -CDN="https://cdn.githaven.org/lasthourcloud" +CDN="https://cdn.lasthourhosting.org/lasthourcloud" curl -fsSL $CDN/docker-compose.yml -o /data/coolify/source/docker-compose.yml curl -fsSL $CDN/docker-compose.prod.yml -o /data/coolify/source/docker-compose.prod.yml