Merge pull request #18 from roib20/v24.06

v24.06
roib20 · Jun 18, 2024 · 26fa9ff · 26fa9ff
2 parents 1226bf2 + a151ccf
commit 26fa9ff
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/proxmox-cloudinit-script/README.md b/proxmox-cloudinit-script/README.md
@@ -3,10 +3,10 @@
 A user-friendly guided script for Proxmox VE 8.x. Guides you through downloading a Linux cloud image and automatically configuring it as a Cloud-init template - that can then be used to easily generate VMs!
 
 Various distros are avaible to download and configure. Current choices include:
-- [Ubuntu Cloud 22.04 LS (Jammy Jellyfish)](https://cloud-images.ubuntu.com/jammy/)
+- [Ubuntu Cloud 22.04 LS (Jammy Jellyfish)](https://cloud-images.ubuntu.com/releases/22.04/)
 - [Ubuntu Minimal Cloud 22.04 LTS (Jammy Jellyfish)](https://cloud-images.ubuntu.com/minimal/releases/jammy/)
 - [Ubuntu Cloud 24.04 LTS (Noble Numbat)](https://cloud-images.ubuntu.com/noble/)
-- [Ubuntu Minimal Cloud 24.04 LTS (Noble Numbat)](https://cloud-images.ubuntu.com/minimal/releases/noble/)
+- [Ubuntu Minimal Cloud 24.04 LTS (Noble Numbat)](https://cloud-images.ubuntu.com/releases/24.04/)
 - [Debian 11 "bullseye" (GenericCloud)](https://cloud.debian.org/images/cloud/bullseye/)
 - [Debian 12 "bookworm" (GenericCloud)](https://cloud.debian.org/images/cloud/bookworm/)
 - [Fedora Cloud 40 (base)](https://download.fedoraproject.org/pub/fedora/linux/releases/40/Cloud/)

diff --git a/proxmox-truenas-script/Bash/pve_truenas.sh b/proxmox-truenas-script/Bash/pve_truenas.sh
@@ -3,7 +3,10 @@
 choose_distro() {
     echo -e "Welcome to the Proxmox Cloud-Init template installer!\n"
     PS3="Please choose a distro image to download (1-6): "
-    local TRUENAS_SCALE_VERSION="24.04.0"
+    local TRUENAS_SCALE_MIRROR="https://download.sys.truenas.net"      # Alternative mirror: "https://download.truenas.com"
+    local TRUENAS_CORE_MIRROR="https://download-core.sys.truenas.net"  # Alternative mirror: "https://download.freenas.org"
+    local TRUENAS_SCALE_CODENAME="Dragonfish" # 24.04
+    local TRUENAS_SCALE_VERSION="24.04.1.1"
     local TRUENAS_CORE_VERSION="13.0"
     local TRUENAS_CORE_UPDATE="U6.1"
 
@@ -14,19 +17,19 @@ choose_distro() {
             echo -e "${distro_list[0]}"
             TEMPLATE_NAME="TrueNAS-SCALE"
             OSTYPE="l26"
-            IMAGE_URL="https://download.truenas.com/TrueNAS-SCALE-Cobia/${TRUENAS_SCALE_VERSION}/TrueNAS-SCALE-${TRUENAS_SCALE_VERSION}.iso"
+            IMAGE_URL="${TRUENAS_SCALE_MIRROR}/TrueNAS-SCALE-${TRUENAS_SCALE_CODENAME}/${TRUENAS_SCALE_VERSION}/TrueNAS-SCALE-${TRUENAS_SCALE_VERSION}.iso"
             CLOUDIMG_NAME="TrueNAS-SCALE-${TRUENAS_SCALE_VERSION}.iso"
-            CHECKSUM_URL="https://download.truenas.com/TrueNAS-SCALE-Cobia/${TRUENAS_SCALE_VERSION}/TrueNAS-SCALE-${TRUENAS_SCALE_VERSION}.iso.sha256"
+            CHECKSUM_URL="${TRUENAS_SCALE_MIRROR}/TrueNAS-SCALE-${TRUENAS_SCALE_CODENAME}/${TRUENAS_SCALE_VERSION}/TrueNAS-SCALE-${TRUENAS_SCALE_VERSION}.iso.sha256"
             SHA=256
             break
             ;;
         "${distro_list[1]}")
             echo -e "${distro_list[1]}"
             TEMPLATE_NAME="TrueNAS-CORE"
             OSTYPE="other"
-            IMAGE_URL="https://download.freenas.org/${TRUENAS_CORE_VERSION}/STABLE/${TRUENAS_CORE_UPDATE}/x64/TrueNAS-${TRUENAS_CORE_VERSION}-${TRUENAS_CORE_UPDATE}.iso"
+            IMAGE_URL="${TRUENAS_CORE_MIRROR}/${TRUENAS_CORE_VERSION}/STABLE/${TRUENAS_CORE_UPDATE}/x64/TrueNAS-${TRUENAS_CORE_VERSION}-${TRUENAS_CORE_UPDATE}.iso"
             CLOUDIMG_NAME="TrueNAS-${TRUENAS_CORE_VERSION}-${TRUENAS_CORE_UPDATE}.iso"
-            CHECKSUM_URL="https://download.freenas.org/${TRUENAS_CORE_VERSION}/STABLE/${TRUENAS_CORE_UPDATE}/x64/TrueNAS-${TRUENAS_CORE_VERSION}-${TRUENAS_CORE_UPDATE}.iso.sha256"
+            CHECKSUM_URL="${TRUENAS_CORE_MIRROR}/${TRUENAS_CORE_VERSION}/STABLE/${TRUENAS_CORE_UPDATE}/x64/TrueNAS-${TRUENAS_CORE_VERSION}-${TRUENAS_CORE_UPDATE}.iso.sha256"
             CHECKSUM="$(curl -s "$CHECKSUM_URL" | grep -oP "(?<= = ).*$")  ${CLOUDIMG_NAME}"
             SHA=256
             break

diff --git a/proxmox-truenas-script/README.md b/proxmox-truenas-script/README.md
@@ -3,7 +3,7 @@
 A user-friendly guided script for Proxmox VE 8.x. Guides you through downloading a TrueNAS ISO and configuring it as a VM.
 
 Multiple versions of TrueNAS are available to download:
-  - [TrueNAS SCALE](https://www.truenas.com/download-truenas-scale/) 24.04.0
+  - [TrueNAS SCALE](https://www.truenas.com/download-truenas-scale/) 24.04.1.1 (Dragonfish)
   - [TrueNAS CORE](https://www.truenas.com/download-truenas-core/) 13.0-U6.1
 
 ## FAQ