From 7f969cf6bb1e81ab30dfd7a1ef50feb233d1f30c Mon Sep 17 00:00:00 2001
From: Alexey Berezhok <a@bayrepo.ru>
Date: Sun, 5 Jan 2025 23:34:30 +0300
Subject: [PATCH] Added minor fixes

---
 bin/v-update-web-templates   | 4 ++--
 install/upgrade/upgrade.conf | 2 +-
 src/rpm/hestia/hestia.spec   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bin/v-update-web-templates b/bin/v-update-web-templates
index ce69360..04d9e90 100755
--- a/bin/v-update-web-templates
+++ b/bin/v-update-web-templates
@@ -50,9 +50,9 @@ for webtpl_folder in $(ls $HESTIA_INSTALL_DIR/templates/web/* -d 2> /dev/null |
 	cp -rf "${webtpl_folder}" "${WEBTPL}/"
 done
 
-versions_list=$(ls -d /etc/php/*)
+versions_list=$(ls -d /etc/opt/remi/php*)
 for php_ver in $versions_list; do
-	[ ! -d "/etc/php/$php_ver/fpm/pool.d/" ] && continue
+	[ ! -d "$php_ver/fpm/pool.d/" ] && continue
 	cp -f $HESTIA_INSTALL_DIR/php-fpm/multiphp.tpl ${WEBTPL}/php-fpm/PHP-${php_ver/\./_}.tpl
 done
 
diff --git a/install/upgrade/upgrade.conf b/install/upgrade/upgrade.conf
index ea6de73..6498948 100644
--- a/install/upgrade/upgrade.conf
+++ b/install/upgrade/upgrade.conf
@@ -21,7 +21,7 @@
 # Update default templates when performing an upgrade
 # These flags should be set to true if any changes are made to the template files
 # to ensure that they are properly updated on the end-user's system.
-UPGRADE_UPDATE_WEB_TEMPLATES='false'
+UPGRADE_UPDATE_WEB_TEMPLATES='true'
 UPGRADE_UPDATE_MAIL_TEMPLATES='false'
 UPGRADE_UPDATE_DNS_TEMPLATES='false'
 
diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec
index 9327e8f..b09145b 100644
--- a/src/rpm/hestia/hestia.spec
+++ b/src/rpm/hestia/hestia.spec
@@ -2,7 +2,7 @@
 %global _hardened_build 1
 
 Name:              hestia
-Version:           1.9.1
+Version:           1.9.2
 Release:           1%{dist}
 Summary:           Hestia Control Panel
 Group:             System Environment/Base
@@ -137,9 +137,6 @@ if [ -e "/usr/local/hestia/data/users/admin" ]; then
     # Upgrade Roundcube if applicable
     upgrade_roundcube | tee -a $LOG
 
-    # Upgrade PHPMailer if applicable
-    upgrade_phpmailer | tee -a $LOG
-
     # Update Cloudflare IPs if applicable
     upgrade_cloudflare_ip | tee -a $LOG
 
@@ -187,6 +184,9 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Sun Jan 05 2025 Alexey Berezhok <a@bayrepo.ru> - 1.9.2-1
+- Added minor fixes
+
 * Mon Dec 30 2024 Alexey Berezhok <a@bayrepo.ru> - 1.9.1-1
 - Added port specification ofor local services on domain editing
 - Added support extended modules