From 8322aede45d7c230430dcc923e09b92f47f7a848 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 07:49:13 -0400 Subject: [PATCH 1/7] Update nginxproxymanager-install.sh tweak --- install/nginxproxymanager-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/nginxproxymanager-install.sh b/install/nginxproxymanager-install.sh index 663c9607d..4314e293c 100644 --- a/install/nginxproxymanager-install.sh +++ b/install/nginxproxymanager-install.sh @@ -41,6 +41,7 @@ $STD apt-get install -y \ python3-certbot-dns-cloudflare $STD pip3 install certbot-dns-multi $STD python3 -m venv /opt/certbot/ +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Installed Python Dependencies" VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)" From 1769a3f40babc0f02358d2e77fc636ed8e4f2109 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 08:29:55 -0400 Subject: [PATCH 2/7] Tweak for Debian 12.6 fix EXTERNALLY-MANAGED --- install/calibre-web-install.sh | 1 + install/pialert-install.sh | 1 + install/stirling-pdf-install.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/install/calibre-web-install.sh b/install/calibre-web-install.sh index cdc5653fc..1f42bbaf0 100644 --- a/install/calibre-web-install.sh +++ b/install/calibre-web-install.sh @@ -23,6 +23,7 @@ msg_ok "Installed Dependencies" msg_info "Installing Python Dependencies" $STD apt-get -y install python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED msg_ok "Installed Python Dependencies" msg_info "Installing Kepubify" diff --git a/install/pialert-install.sh b/install/pialert-install.sh index f90ea6b82..d08f16f7f 100644 --- a/install/pialert-install.sh +++ b/install/pialert-install.sh @@ -50,6 +50,7 @@ msg_info "Installing Python Dependencies" $STD apt-get -y install \ python3-pip \ python3-requests +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED $STD pip3 install mac-vendor-lookup $STD pip3 install fritzconnection $STD pip3 install cryptography diff --git a/install/stirling-pdf-install.sh b/install/stirling-pdf-install.sh index f0c802a2e..88456a66d 100644 --- a/install/stirling-pdf-install.sh +++ b/install/stirling-pdf-install.sh @@ -42,6 +42,7 @@ msg_info "Installing Python Dependencies" $STD apt-get install -y \ python3 \ python3-pip +rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED $STD pip3 install \ uno \ opencv-python-headless \ From 8fd1727fa8119ee4685dbf740368df8822cdad25 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 09:09:08 -0400 Subject: [PATCH 3/7] Update alpine-nextcloud.sh Remove "update" option fixes https://github.com/tteck/Proxmox/issues/3298 --- ct/alpine-nextcloud.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/ct/alpine-nextcloud.sh b/ct/alpine-nextcloud.sh index 6def6e536..c683cfe2d 100644 --- a/ct/alpine-nextcloud.sh +++ b/ct/alpine-nextcloud.sh @@ -60,12 +60,10 @@ function update_script() { if ! apk -e info newt >/dev/null 2>&1; then apk add -q newt fi - RELEASE=$(curl -s https://api.github.com/repos/nextcloud/server/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') while true; do CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 3 \ - "1" "Update Nextcloud to $RELEASE" OFF \ - "2" "Nextcloud Login Credentials" ON \ - "3" "Renew Self-signed Certificate" OFF \ + "1" "Nextcloud Login Credentials" ON \ + "2" "Renew Self-signed Certificate" OFF \ 3>&1 1>&2 2>&3) exit_status=$? if [ $exit_status == 1 ]; then @@ -75,22 +73,10 @@ function update_script() { header_info case $CHOICE in 1) - apk update && apk upgrade - if ! apk -e info php82-sodium >/dev/null 2>&1; then - apk add -q php82-sodium - fi - if ! apk -e info php82-bz2 >/dev/null 2>&1; then - apk add -q php82-bz2 - fi - su nextcloud -s /bin/sh -c 'php82 /usr/share/webapps/nextcloud/occ upgrade' - su nextcloud -s /bin/sh -c 'php82 /usr/share/webapps/nextcloud/occ db:add-missing-indices' - exit - ;; - 2) cat nextcloud.creds exit ;; - 3) + 2) openssl req -x509 -nodes -days 365 -newkey rsa:4096 -keyout /etc/ssl/private/nextcloud-selfsigned.key -out /etc/ssl/certs/nextcloud-selfsigned.crt -subj "/C=US/O=Nextcloud/OU=Domain Control Validated/CN=nextcloud.local" > /dev/null 2>&1 rc-service nginx restart exit From c29768de514897da677e65e72e03439fb6308350 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 09:35:33 -0400 Subject: [PATCH 4/7] Update build.func switch Alpine repositories to http://dl-cdn.alpinelinux.org/alpine/latest-stable/main http://dl-cdn.alpinelinux.org/alpine/latest-stable/community from http://dl-cdn.alpinelinux.org/alpine/v3.19/main http://dl-cdn.alpinelinux.org/alpine/v3.19/community --- misc/build.func | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/misc/build.func b/misc/build.func index e8e98f4b3..c7c501e7e 100644 --- a/misc/build.func +++ b/misc/build.func @@ -629,10 +629,10 @@ EOF if [ "$var_os" == "alpine" ]; then sleep 3 pct exec "$CTID" -- /bin/sh -c 'cat </etc/apk/repositories -#http://dl-cdn.alpinelinux.org/alpine/latest-stable/main -#http://dl-cdn.alpinelinux.org/alpine/latest-stable/community -http://dl-cdn.alpinelinux.org/alpine/v3.19/main -http://dl-cdn.alpinelinux.org/alpine/v3.19/community +http://dl-cdn.alpinelinux.org/alpine/latest-stable/main +http://dl-cdn.alpinelinux.org/alpine/latest-stable/community +#http://dl-cdn.alpinelinux.org/alpine/v3.19/main +#http://dl-cdn.alpinelinux.org/alpine/v3.19/community EOF' pct exec "$CTID" -- ash -c "apk add bash >/dev/null" fi From d3f71d078d71764e98ac566cf6b7faf70be08471 Mon Sep 17 00:00:00 2001 From: nazgul6 Date: Sun, 30 Jun 2024 15:43:59 +0200 Subject: [PATCH 5/7] Updated debian 12 image (#3299) --- vm/debian-vm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vm/debian-vm.sh b/vm/debian-vm.sh index 6a20b717a..5061d4ac2 100644 --- a/vm/debian-vm.sh +++ b/vm/debian-vm.sh @@ -370,7 +370,7 @@ fi msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location." msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}." msg_info "Retrieving the URL for the Debian 12 Qcow2 Disk Image" -URL=https://cloud.debian.org/images/cloud/bookworm/20231228-1609/debian-12-nocloud-amd64-20231228-1609.qcow2 +URL=https://cloud.debian.org/images/cloud/bookworm/20240507-1740/debian-12-nocloud-amd64-20240507-1740.qcow2 sleep 2 msg_ok "${CL}${BL}${URL}${CL}" wget -q --show-progress $URL From 39ea1d4a20b83c07d084ebafdc811eec3548f289 Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 10:18:37 -0400 Subject: [PATCH 6/7] Require PVE 8.1 or later --- misc/build.func | 9 +++------ vm/debian-vm.sh | 6 +++--- vm/haos-vm.sh | 6 +++--- vm/mikrotik-routeros.sh | 10 +++++----- vm/nextcloud-vm.sh | 6 +++--- vm/openwrt.sh | 8 ++++---- vm/owncloud-vm.sh | 6 +++--- vm/ubuntu2204-vm.sh | 6 +++--- vm/ubuntu2404-vm.sh | 6 +++--- 9 files changed, 30 insertions(+), 33 deletions(-) diff --git a/misc/build.func b/misc/build.func index c7c501e7e..b650a6c00 100644 --- a/misc/build.func +++ b/misc/build.func @@ -95,16 +95,13 @@ root_check() { # This function checks the version of Proxmox Virtual Environment (PVE) and exits if the version is not supported. pve_check() { - if [ $(pveversion | grep "pve-manager/8" | wc -l) -ne 1 ]; then - whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Proxmox VE 7 Detected" "You are currently using Proxmox VE 7 (EOL 2024-07), refrain from creating Debian 12 LXCs. \nDefault distribution for $APP LXC is ${var_os} ${var_version}" 10 60 - fi - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } # This function checks the system architecture and exits if it's not "amd64". diff --git a/vm/debian-vm.sh b/vm/debian-vm.sh index 5061d4ac2..d61593171 100644 --- a/vm/debian-vm.sh +++ b/vm/debian-vm.sh @@ -92,13 +92,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 4c82712ae..bad50312f 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -115,13 +115,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/mikrotik-routeros.sh b/vm/mikrotik-routeros.sh index af4fd0c21..f9e05f333 100644 --- a/vm/mikrotik-routeros.sh +++ b/vm/mikrotik-routeros.sh @@ -62,11 +62,11 @@ function cleanup() { } TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then - echo "⚠ This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." - echo "Exiting..." - sleep 3 +if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then + msg_error "This version of Proxmox Virtual Environment is not supported" + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." + echo -e "Exiting..." + sleep 2 exit fi if (whiptail --backtitle "Proxmox VE Helper Scripts" --title "Mikrotik RouterOS CHR VM" --yesno "This will create a New Mikrotik RouterOS CHR VM. Proceed?" 10 58); then diff --git a/vm/nextcloud-vm.sh b/vm/nextcloud-vm.sh index 23cc56062..1e50c37dc 100644 --- a/vm/nextcloud-vm.sh +++ b/vm/nextcloud-vm.sh @@ -91,13 +91,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/openwrt.sh b/vm/openwrt.sh index e3e32e9e0..3cdd38f3c 100644 --- a/vm/openwrt.sh +++ b/vm/openwrt.sh @@ -157,13 +157,13 @@ function msg_error() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then - echo -e "${CROSS} This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then + msg_error "This version of Proxmox Virtual Environment is not supported" + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/owncloud-vm.sh b/vm/owncloud-vm.sh index 006a46499..871f5eeba 100644 --- a/vm/owncloud-vm.sh +++ b/vm/owncloud-vm.sh @@ -91,13 +91,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/ubuntu2204-vm.sh b/vm/ubuntu2204-vm.sh index 5fffcf0d6..cb6884d80 100644 --- a/vm/ubuntu2204-vm.sh +++ b/vm/ubuntu2204-vm.sh @@ -92,13 +92,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { diff --git a/vm/ubuntu2404-vm.sh b/vm/ubuntu2404-vm.sh index 7869d1896..c3dd17502 100644 --- a/vm/ubuntu2404-vm.sh +++ b/vm/ubuntu2404-vm.sh @@ -92,13 +92,13 @@ function check_root() { } function pve_check() { - if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then + if ! pveversion | grep -Eq "pve-manager/8.[1-3]"; then msg_error "This version of Proxmox Virtual Environment is not supported" - echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later." + echo -e "Requires Proxmox Virtual Environment Version 8.1 or later." echo -e "Exiting..." sleep 2 exit - fi +fi } function arch_check() { From 6e6a86aaa9d134d7e94efee9fff62c2cfea0b11c Mon Sep 17 00:00:00 2001 From: tteckster Date: Sun, 30 Jun 2024 11:50:59 -0400 Subject: [PATCH 7/7] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca9f10438..8d29cea1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,14 @@ - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment. + +## 2024-06-30 + +### Changed + +- **All Scripts** + - Requires Proxmox Virtual Environment version 8.1 or later. + ## 2024-06-27 ### Changed