fix(2fauth): update PHP version from 8.3 to 8.4 in update_script

The install script uses PHP 8.4, but the update_script was still
checking for and upgrading to PHP 8.3. This aligns the update
with the install configuration.

Also improved the sed pattern to handle any 8.x version.

CHANGELOG.md

@@ -20,8 +20,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🐞 Bug Fixes
 
-    - Fix: mariadb repo in update_scripts [@MickLesk](https://github.com/MickLesk) ([#10034](https://github.com/community-scripts/ProxmoxVE/pull/10034))
-    - 2fauth: update PHP version from 8.3 to 8.4 in update_script [@MickLesk](https://github.com/MickLesk) ([#10035](https://github.com/community-scripts/ProxmoxVE/pull/10035))
     - pdm: add rsyslog to fix /dev/log Connection refused errors [@MickLesk](https://github.com/MickLesk) ([#10018](https://github.com/community-scripts/ProxmoxVE/pull/10018))
     - 2fauth: bump to php8.4 [@MickLesk](https://github.com/MickLesk) ([#10019](https://github.com/community-scripts/ProxmoxVE/pull/10019))
     - Miniflux: use correct systemctl to check service instead of file path [@MickLesk](https://github.com/MickLesk) ([#10024](https://github.com/community-scripts/ProxmoxVE/pull/10024))

ct/2fauth.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "2fauth" "Bubka/2FAuth"; then
     $STD apt update
     $STD apt -y upgrade

ct/apache-guacamole.sh

@@ -20,16 +20,15 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /opt/apache-guacamole ]]; then
-    msg_error "No ${APP} Installation Found!"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /opt/apache-guacamole ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_error "Currently we don't provide an update function for this ${APP}."
     exit
-  fi
-  setup_mariadb
-  msg_error "Currently we don't provide an update function for this ${APP}."
-  exit
 }
 
 start

ct/booklore.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "booklore" "booklore-app/BookLore"; then
     msg_info "Stopping Service"
     systemctl stop booklore

ct/bookstack.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "bookstack" "BookStackApp/BookStack"; then
     msg_info "Stopping Apache2"
     systemctl stop apache2

ct/dolibarr.sh

@@ -20,16 +20,15 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /usr/share/dolibarr ]]; then
-    msg_error "No ${APP} Installation Found!"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /usr/share/dolibarr ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_error "To update ${APP}, use the applications web interface."
     exit
-  fi
-  setup_mariadb
-  msg_error "To update ${APP}, use the applications web interface."
-  exit
 }
 
 start
@@ -39,4 +38,4 @@ description
 msg_ok "Completed Successfully!\n"
 echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
 echo -e "${INFO}${YW} Access it using the following URL:${CL}"
-echo -e "${TAB}${GATEWAY}${BGN}http://${IP}/dolibarr/install${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}/dolibarr/install${CL}"

ct/domain-monitor.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
 
   if ! grep -Fq "root /usr/bin/php /opt/domain-monitor/cron/check_domains.php" /etc/crontab; then
     echo "0 0 * * * root /usr/bin/php /opt/domain-monitor/cron/check_domains.php" >>/etc/crontab

ct/firefly.sh

@@ -28,7 +28,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "firefly" "firefly-iii/firefly-iii"; then
     systemctl stop apache2
     cp /opt/firefly/.env /opt/.env

ct/ghost.sh

@@ -23,7 +23,6 @@ function update_script() {
   header_info
   check_container_storage
   check_container_resources
-  setup_mariadb
 
   NODE_VERSION="22" setup_nodejs
 

ct/glpi.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   RELEASE=$(curl -fsSL https://api.github.com/repos/glpi-project/glpi/releases/latest | grep '"tag_name"' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
   if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_error "Currently we don't provide an update function for this ${APP}."

ct/hortusfox.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "hortusfox" "danielbrendel/hortusfox-web"; then
     msg_info "Stopping Service"
     systemctl stop apache2

ct/invoiceninja.sh

@@ -28,7 +28,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "invoiceninja" "invoiceninja/invoiceninja"; then
     msg_info "Stopping Services"
     systemctl stop supervisor nginx php8.4-fpm

ct/itsm-ng.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit 1
   fi
-  setup_mariadb
 
   msg_info "Updating LXC"
   $STD apt update

ct/kimai.sh

@@ -30,12 +30,11 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
 
   PHP_VERSION="8.4" PHP_MODULE="mysql" PHP_APACHE="YES" setup_php
   setup_composer
 
-  if check_for_gh_release "kimai" "kimai/kimai"; then
+    if check_for_gh_release "kimai" "kimai/kimai"; then
     BACKUP_DIR="/opt/kimai_backup"
 
     msg_info "Stopping Apache2"

ct/leantime.sh

@@ -28,7 +28,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "leantime" "Leantime/leantime"; then
     msg_info "Creating Backup"
     mariadb-dump leantime >"/opt/${APP}_db_backup_$(date +%F).sql"

ct/librenms.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   msg_info "Updating LibreNMS"
   su librenms
   cd /opt/librenms

ct/limesurvey.sh

@@ -20,17 +20,16 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /opt/limesurvey ]]; then
-    msg_error "No ${APP} Installation Found!"
-    exit
-  fi
-  setup_mariadb
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /opt/limesurvey ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
 
-  msg_warn "Application is updated via Web Interface"
-  exit
+    msg_warn "Application is updated via Web Interface"
+    exit
 }
 
 start

ct/managemydamnlife.sh

@@ -28,7 +28,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "mmdl" "intri-in/manage-my-damn-life-nextjs"; then
     msg_info "Stopping service"
     systemctl stop mmdl

ct/mariadb.sh

@@ -20,19 +20,18 @@ color
 catch_errors
 
 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -d /etc/mysql/mariadb.conf.d ]]; then
-    msg_error "No ${APP} Installation Found!"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /etc/mysql/mariadb.conf.d ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Updating ${APP} LXC"
+    $STD apt update
+    $STD apt -y upgrade
+    msg_ok "Updated successfully!"
     exit
-  fi
-  setup_mariadb
-  msg_info "Updating ${APP} LXC"
-  $STD apt update
-  $STD apt -y upgrade
-  msg_ok "Updated successfully!"
-  exit
 }
 
 start

ct/miniflux.sh

@@ -34,7 +34,7 @@ function update_script() {
   msg_ok "Service Stopped"
 
   fetch_and_deploy_gh_release "miniflux" "miniflux/v2" "binary" "latest"
-
+  
   msg_info "Updating Miniflux"
   $STD miniflux -migrate -config-file /etc/miniflux.conf
   msg_ok "Updated Miniflux"

ct/monica.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
 
   NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
 

ct/passbolt.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   msg_info "Updating $APP LXC"
   $STD apt update
   $STD apt upgrade -y

ct/paymenter.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
 
   CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
   if [[ "$CURRENT_PHP" != "8.3" ]]; then

ct/pelican-panel.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
 
   if [[ "$CURRENT_PHP" != "8.4" ]]; then

ct/phpipam.sh

@@ -27,7 +27,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "phpipam" "phpipam/phpipam"; then
     msg_info "Stopping Service"
     systemctl stop apache2

ct/plant-it.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if check_for_gh_release "plant-it" "MDeLuise/plant-it"; then
     msg_info "Stopping Service"
     systemctl stop plant-it

ct/projectsend.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
 
   if check_for_gh_release "projectsend" "projectsend/projectsend"; then
     msg_info "Stopping Service"

ct/pterodactyl-panel.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   CURRENT_PHP=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
 
   if [[ "$CURRENT_PHP" != "8.4" ]]; then

ct/shinobi.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   msg_info "Updating Shinobi"
   cd /opt/Shinobi
   $STD sh UPDATE.sh

ct/snipeit.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   if ! grep -q "client_max_body_size[[:space:]]\+100M;" /etc/nginx/conf.d/snipeit.conf; then
     sed -i '/index index.php;/i \        client_max_body_size 100M;' /etc/nginx/conf.d/snipeit.conf
   fi

ct/wallabag.sh

@@ -28,7 +28,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "wallabag" "wallabag/wallabag"; then
     msg_info "Stopping Services"
     systemctl stop nginx php8.3-fpm

ct/wavelog.sh

@@ -27,7 +27,7 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
+
   if check_for_gh_release "wavelog" "wavelog/wavelog"; then
     msg_info "Stopping Services"
     systemctl stop apache2

ct/wordpress.sh

@@ -27,7 +27,6 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
-  setup_mariadb
   msg_error "Wordpress should be updated via the user interface."
   exit
 }

ct/zabbix.sh

@@ -67,7 +67,7 @@ function update_script() {
 
   rm -Rf /etc/apt/sources.list.d/zabbix.list
   cd /tmp
-  ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"
+  ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"
   curl -fsSL "$ZABBIX_DEB_URL" -o /tmp/zabbix-release_latest+debian13_all.deb
   $STD dpkg -i zabbix-release_latest+debian13_all.deb
   rm -rf /tmp/zabbix-release_latest+debian13_all.deb

install/zabbix-install.sh

@@ -31,7 +31,7 @@ esac
 
 msg_info "Installing Zabbix $ZABBIX_VERSION"
 cd /tmp
-ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"
+ZABBIX_DEB_URL="https://repo.zabbix.com/zabbix/${ZABBIX_VERSION}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb"
 curl -fsSL "$ZABBIX_DEB_URL" -o /tmp/zabbix-release_latest+debian13_all.deb
 $STD dpkg -i /tmp/zabbix-release_latest+debian13_all.deb
 $STD apt update