Merge 292a56a892 into 5d69a62b47

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -17,6 +17,14 @@ All LXC instances created using this repository come pre-installed with Midnight
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
 
+## 2025-01-19
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Update Opengist.sh: Fix broken backup function [@bvdberg01](https://github.com/bvdberg01) ([#1572](https://github.com/community-scripts/ProxmoxVE/pull/1572))
+
 ## 2025-01-18
 
 ### Changed

README.md

@@ -17,7 +17,7 @@
       <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
     </a> 
     <a href="https://ko-fi.com/community_scripts">
-      <img src="https://img.shields.io/badge/Donate-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
+      <img src="https://img.shields.io/badge/Support-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
     </a>
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/.github/CONTRIBUTING.md">
       <img src="https://img.shields.io/badge/Contribute-ff4785?style=for-the-badge&logo=git&logoColor=white" alt="Contribute" />

ct/opengist.sh

@@ -32,29 +32,35 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
+  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Stopping Service"
     systemctl stop opengist.service
     msg_ok "Stopped Service"
-  apt-get update &>/dev/null
-  apt-get upgrade &>/dev/null
-  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    
     msg_info "Updating ${APP} to v${RELEASE}"
+    apt-get update &>/dev/null
+    apt-get -y upgrade &>/dev/null
     cd /opt
-    wget -qO "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
-    rm -rf /opt/opengist
+    mv /opt/opengist /opt/opengist-backup
+    wget -q "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
     tar -xzf opengist${RELEASE}-linux-amd64.tar.gz
+    mv /opt/opengist-backup/config.yml /opt/opengist/config.yml
     chmod +x /opt/opengist/opengist
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
-    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
-    apt-get -y autoremove &>/dev/null
-    apt-get -y autoclean &>/dev/null
     msg_ok "Updated ${APP} LXC"
 
     msg_info "Starting Service"
     systemctl start opengist.service
     msg_ok "Started Service"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
+    rm -rf /opt/opengist-backup
+    apt-get -y autoremove &>/dev/null
+    apt-get -y autoclean &>/dev/null
+    msg_ok "Cleaned"
+    msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."
   fi

json/opengist.json

@@ -6,7 +6,7 @@
     ],
     "date_created": "2025-01-14",
     "type": "ct",
-    "updateable": false,
+    "updateable": true,
     "privileged": false,
     "interface_port": 6157,
     "documentation": null,

json/post-pmg-install.json

@@ -0,0 +1,47 @@
+{
+"name": "Proxmox Mail Gateway Post Install",
+"slug": "post-pmg-install",
+"categories": [
+1
+],
+"date_created": "2025-01-17",
+"type": "misc",
+"updateable": false,
+"privileged": false,
+"interface_port": null,
+"documentation": null,
+"website": null,
+"logo": "https://raw.githubusercontent.com/home-assistant/brands/master/core_integrations/proxmoxve/icon.png",
+"description": "The script will give options to Disable the Enterprise Repo, Add/Correct PMG Sources, Enable the No-Subscription Repo, Add Test Repo, Disable Subscription Nag, Update Proxmox Mail Gateway and Reboot PMG.",
+"install_methods": [
+{
+"type": "default",
+"script": "misc/post-pmg-install.sh",
+"resources": {
+"cpu": null,
+"ram": null,
+"hdd": null,
+"os": null,
+"version": null
+}
+}
+],
+"default_credentials": {
+"username": null,
+"password": null
+},
+"notes": [
+{
+"text": "Proxmox Mail Gateway ONLY",
+"type": "info"
+},
+{
+"text": "Execute within the Proxmox Mail Gateway Shell",
+"type": "info"
+},
+{
+"text": "It is recommended to answer “yes” (y) to all options presented during the process.",
+"type": "info"
+}
+]
+}

misc/.app-headers

@@ -1,4 +1,4 @@
-### Generated on 01-18-2025
+### Generated on 01-19-2025
 ##################################################
 
 ### 2fauth.sh

misc/post-pmg-install.sh

@@ -0,0 +1,177 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 tteck | community-scripts ORG
+# Author: thost96 (thost96)
+# License: MIT
+# https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+
+header_info() {
+  clear
+  cat <<"EOF"
+ ____  __  __  ____   ____           _     ___           _        _ _
+|  _ \|  \/  |/ ___| |  _ \ ___  ___| |_  |_ _|_ __  ___| |_ __ _| | |
+| |_) | |\/| | |  _  | |_) / _ \/ __| __|  | || '_ \/ __| __/ _` | | |
+|  __/| |  | | |_| | |  __/ (_) \__ \ |_   | || | | \__ \ || (_| | | |
+|_|   |_|  |_|\____| |_|   \___/|___/\__| |___|_| |_|___/\__\__,_|_|_|
+EOF
+}
+
+RD=$(echo "\033[01;31m")
+YW=$(echo "\033[33m")
+GN=$(echo "\033[1;92m")
+CL=$(echo "\033[m")
+BFR="\\r\\033[K"
+HOLD="-"
+CM="${GN}✓${CL}"
+CROSS="${RD}✗${CL}"
+
+set -euo pipefail
+shopt -s inherit_errexit nullglob
+
+msg_info() {
+  local msg="$1"
+  echo -ne " ${HOLD} ${YW}${msg}..."
+}
+
+msg_ok() {
+  local msg="$1"
+  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
+}
+
+msg_error() {
+  local msg="$1"
+  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
+}
+
+start_routines() {
+  header_info
+  VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PMG SOURCES" --menu "This will set the correct sources to update and install Proxmox Mail Gateway.\n \nChange to Proxmox Mail Gateway sources?" 14 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Changing to Proxmox Mail Gateway Sources"
+    cat <<EOF >/etc/apt/sources.list
+deb http://deb.debian.org/debian ${VERSION} main contrib
+deb http://deb.debian.org/debian ${VERSION}-updates main contrib
+deb http://security.debian.org/debian-security ${VERSION}-security main contrib
+EOF
+    msg_ok "Changed to Proxmox Mail Gateway Sources"
+    ;;
+  no)
+    msg_error "Selected no to Correcting Proxmox Mail Gateway Sources"
+    ;;
+  esac
+
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PMG-ENTERPRISE" --menu "The 'pmg-enterprise' repository is only available to users who have purchased a Proxmox Mail Gateway subscription.\n \nDisable 'pmg-enterprise' repository?" 14 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Disabling 'pmg-enterprise' repository"
+    cat <<EOF >/etc/apt/sources.list.d/pmg-enterprise.list
+# deb https://enterprise.proxmox.com/debian/pmg ${VERSION} pmg-enterprise
+EOF
+    msg_ok "Disabled 'pmg-enterprise' repository"
+    ;;
+  no)
+    msg_error "Selected no to Disabling 'pmg-enterprise' repository"
+    ;;
+  esac
+
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PMG-NO-SUBSCRIPTION" --menu "The 'pmg-no-subscription' repository provides access to all of the open-source components of Proxmox Mail Gateway.\n \nEnable 'pmg-no-subscription' repository?" 14 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Enabling 'pmg-no-subscription' repository"
+    cat <<EOF >/etc/apt/sources.list.d/pmg-install-repo.list
+deb http://download.proxmox.com/debian/pmg ${VERSION} pmg-no-subscription
+EOF
+    msg_ok "Enabled 'pmg-no-subscription' repository"
+    ;;
+  no)
+    msg_error "Selected no to Enabling 'pmg-no-subscription' repository"
+    ;;
+  esac
+
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "PMG TEST" --menu "The 'pmgtest' repository can give advanced users access to new features and updates before they are officially released.\n \nAdd (Disabled) 'pmgtest' repository?" 14 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Adding 'pmgtest' repository and set disabled"
+    cat <<EOF >/etc/apt/sources.list.d/pmgtest-for-beta.list
+# deb http://download.proxmox.com/debian/pmg ${VERSION} pmgtest
+EOF
+    msg_ok "Added 'pmgtest' repository"
+    ;;
+  no)
+    msg_error "Selected no to Adding 'pmgtest' repository"
+    ;;
+  esac
+
+  if [[ ! -f /etc/apt/apt.conf.d/no-nag-script ]]; then
+    CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUBSCRIPTION NAG" --menu "This will disable the nag message reminding you to purchase a subscription every time you log in to the web interface.\n \nDisable subscription nag?" 14 58 2 \
+      "yes" " " \
+      "no" " " 3>&2 2>&1 1>&3)
+    case $CHOICE in
+    yes)
+      whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Support Subscriptions" "Supporting the software's development team is essential. Check their official website's Support Subscriptions for pricing. Without their dedicated work, we wouldn't have this exceptional software." 10 58
+      msg_info "Disabling subscription nag"
+      echo "DPkg::Post-Invoke { \"dpkg -V proxmox-widget-toolkit | grep -q '/proxmoxlib\.js$'; if [ \$? -eq 1 ]; then { echo 'Removing subscription nag from UI...'; sed -i '/data\.status.*{/{s/\!//;s/active/NoMoreNagging/}' /usr/share/javascript/proxmox-widget-toolkit/proxmoxlib.js; }; fi\"; };" >/etc/apt/apt.conf.d/no-nag-script
+      apt --reinstall install proxmox-widget-toolkit &>/dev/null
+      msg_ok "Disabled subscription nag (Delete browser cache)"
+      ;;
+    no)
+      whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Support Subscriptions" "Supporting the software's development team is essential. Check their official website's Support Subscriptions for pricing. Without their dedicated work, we wouldn't have this exceptional software." 10 58
+      msg_error "Selected no to Disabling subscription nag"
+      ;;
+    esac
+  fi
+
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UPDATE" --menu "\nUpdate Proxmox Mail Gateway now?" 11 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Updating Proxmox Mail Gateway (Patience)"
+    apt-get update &>/dev/null
+    apt-get -y dist-upgrade &>/dev/null
+    msg_ok "Updated Proxmox Mail Gateway"
+    ;;
+  no)
+    msg_error "Selected no to Updating Proxmox Mail Gateway"
+    ;;
+  esac
+
+  CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "REBOOT" --menu "\nReboot Proxmox Mail Gateway now? (recommended)" 11 58 2 \
+    "yes" " " \
+    "no" " " 3>&2 2>&1 1>&3)
+  case $CHOICE in
+  yes)
+    msg_info "Rebooting Proxmox Mail Gateway"
+    sleep 2
+    msg_ok "Completed Post Install Routines"
+    reboot
+    ;;
+  no)
+    msg_error "Selected no to Rebooting Proxmox Mail Gateway (Reboot recommended)"
+    msg_ok "Completed Post Install Routines"
+    ;;
+  esac
+}
+
+header_info
+echo -e "\nThis script will Perform Post Install Routines.\n"
+while true; do
+  read -p "Start the Proxmox Mail Gateway Post Install Script (y/n)?" yn
+  case $yn in
+  [Yy]*) break ;;
+  [Nn]*) clear; exit ;;
+  *) echo "Please answer yes or no." ;;
+  esac
+done
+
+start_routines