CHANGELOG.md

@@ -10,13 +10,6 @@
 - 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.
 - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent <a href='https://forum.proxmox.com/threads/proxmox-ve-support-lifecycle.35755/' target='_blank' rel='noopener noreferrer'>Proxmox VE - Support Lifecycle</a>**
 
-## 2024-03-08
-
-### Changed
-
-- **Proxmox VE Post Install**
-  - Requires Proxmox Virtual Environment Version 8.1.1 or later.
-
 ## 2024-02-26
 
 ### Changed

ct/changedetection.sh

@@ -56,10 +56,6 @@ function update_script() {
 header_info
 if [[ ! -f /etc/systemd/system/changedetection.service ]]; then msg_error "No ${APP} Installation Found!"; exit; fi
 msg_info "Updating ${APP} LXC"
-if ! dpkg -s libjpeg-dev >/dev/null 2>&1; then
-  apt-get update
-  apt-get install -y libjpeg-dev
-fi
 pip3 install changedetection.io --upgrade &>/dev/null
 pip3 install playwright --upgrade &>/dev/null
 systemctl restart changedetection

install/changedetection-install.sh

@@ -22,7 +22,6 @@ $STD apt-get install -y \
   build-essential \
   dumb-init \
   gconf-service \
-  libjpeg-dev \
   libatk-bridge2.0-0 \
   libasound2 \
   libatk1.0-0 \

install/mqtt-install.sh

@@ -21,6 +21,15 @@ $STD apt-get install -y gpg
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Mosquitto MQTT Broker"
+if [ "$PCT_OSTYPE" == "debian" ]; then
+  VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
+ # wget -qO- http://repo.mosquitto.org/debian/mosquitto-repo.gpg.key >/etc/apt/trusted.gpg.d/mosquitto-repo.asc
+ # wget -qO /etc/apt/sources.list.d/mosquitto-${VERSION}.list http://repo.mosquitto.org/debian/mosquitto-${VERSION}.list
+  gpg --keyserver keyserver.ubuntu.com --recv-keys 779B22DFB3E717B7 >/dev/null 2>&1
+  gpg --export 779B22DFB3E717B7 | tee /etc/apt/trusted.gpg.d/mosquitto.gpg >/dev/null 2>&1
+  echo "deb [arch=amd64 signed-by=/etc/apt/trusted.gpg.d/mosquitto.gpg] https://repo.mosquitto.org/debian ${VERSION} main" >/etc/apt/sources.list.d/mosquitto-${VERSION}.list
+  $STD apt-get update
+fi
 $STD apt-get -y install mosquitto
 $STD apt-get -y install mosquitto-clients
 cat <<EOF >/etc/mosquitto/conf.d/default.conf

install/tandoor-install.sh

@@ -127,6 +127,7 @@ server {
     location / {
         proxy_set_header Host $http_host;
         proxy_pass http://unix:/opt/tandoor/tandoor.sock;
+        proxy_set_header X-Forwarded-Proto $scheme;
     }
 }
 EOF

misc/post-pve-install.sh

@@ -46,6 +46,7 @@ msg_error() {
 
 start_routines() {
   header_info
+  VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
 
   CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SOURCES" --menu "The package manager will use the correct sources to update and install packages on your Proxmox VE server.\n \nCorrect Proxmox VE sources?" 14 58 2 \
     "yes" " " \
@@ -54,11 +55,10 @@ start_routines() {
   yes)
     msg_info "Correcting Proxmox VE Sources"
     cat <<EOF >/etc/apt/sources.list
-deb http://deb.debian.org/debian bookworm main contrib
+deb http://ftp.debian.org/debian ${VERSION} main contrib
-deb http://deb.debian.org/debian bookworm-updates main contrib
+deb http://ftp.debian.org/debian ${VERSION}-updates main contrib
-deb http://security.debian.org/debian-security bookworm-security main contrib
+deb http://security.debian.org/debian-security ${VERSION}-security main contrib
 EOF
-echo 'APT::Get::Update::SourceListWarnings::NonFreeFirmware "false";' >/etc/apt/apt.conf.d/no-bookworm-firmware.conf
     msg_ok "Corrected Proxmox VE Sources"
     ;;
   no)
@@ -73,7 +73,7 @@ echo 'APT::Get::Update::SourceListWarnings::NonFreeFirmware "false";' >/etc/apt/
   yes)
     msg_info "Disabling 'pve-enterprise' repository"
     cat <<EOF >/etc/apt/sources.list.d/pve-enterprise.list
-# deb https://enterprise.proxmox.com/debian/pve bookworm pve-enterprise
+# deb https://enterprise.proxmox.com/debian/pve ${VERSION} pve-enterprise
 EOF
     msg_ok "Disabled 'pve-enterprise' repository"
     ;;
@@ -89,7 +89,7 @@ EOF
   yes)
     msg_info "Enabling 'pve-no-subscription' repository"
     cat <<EOF >/etc/apt/sources.list.d/pve-install-repo.list
-deb http://download.proxmox.com/debian/pve bookworm pve-no-subscription
+deb http://download.proxmox.com/debian/pve ${VERSION} pve-no-subscription
 EOF
     msg_ok "Enabled 'pve-no-subscription' repository"
     ;;
@@ -98,6 +98,7 @@ EOF
     ;;
   esac
 
+  if [[ "${VERSION}" == "bookworm" ]]; then
     CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CEPH PACKAGE REPOSITORIES" --menu "The 'Ceph Package Repositories' provides access to both the 'no-subscription' and 'enterprise' repositories (initially disabled).\n \nCorrect 'ceph package sources?" 14 58 2 \
       "yes" " " \
       "no" " " 3>&2 2>&1 1>&3)
@@ -116,6 +117,7 @@ EOF
       msg_error "Selected no to Correcting 'ceph package repositories'"
       ;;
     esac
+  fi
 
   CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PVETEST" --menu "The 'pvetest' repository can give advanced users access to new features and updates before they are officially released.\n \nAdd (Disabled) 'pvetest' repository?" 14 58 2 \
     "yes" " " \
@@ -124,7 +126,7 @@ EOF
   yes)
     msg_info "Adding 'pvetest' repository and set disabled"
     cat <<EOF >/etc/apt/sources.list.d/pvetest-for-beta.list
-# deb http://download.proxmox.com/debian/pve bookworm pvetest
+# deb http://download.proxmox.com/debian/pve ${VERSION} pvetest
 EOF
     msg_ok "Added 'pvetest' repository"
     ;;
@@ -231,11 +233,9 @@ while true; do
   esac
 done
 
-if ! pveversion | grep -Eq "pve-manager/(8.1.[1-9])"; then
+if ! command -v pveversion >/dev/null 2>&1; then
-  msg_error "This version of Proxmox Virtual Environment is not supported"
+  header_info
-  echo -e "Requires Proxmox Virtual Environment Version 8.1.1 or later."
+  msg_error "\n No PVE Detected!\n"
-  echo -e "Exiting..."
-  sleep 2
   exit
 fi