From 479a65e0dd8462a9954a50882ed7db3f05d490d5 Mon Sep 17 00:00:00 2001
From: alexey <a@bayrepo.ru>
Date: Sat, 28 Mar 2026 18:55:38 +0300
Subject: [PATCH] Added remi php install fixes

---
 func/domain.sh             |  2 +-
 install/hst-install.sh     | 14 ++++++++------
 src/rpm/hestia/hestia.spec |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/func/domain.sh b/func/domain.sh
index c65b5b1..566391b 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -432,7 +432,7 @@ add_web_config() {
     	if [ -n "$php_type" ]; then
     		php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
     	else
-    		php_cgi_path="/etc/opt/remi/php${php_ver}/bin/php-cgi"
+    		php_cgi_path="/opt/remi/php${php_ver}/root/bin/php-cgi"
     	fi
 	fi
 
diff --git a/install/hst-install.sh b/install/hst-install.sh
index 4583bfa..6c2e4d5 100755
--- a/install/hst-install.sh
+++ b/install/hst-install.sh
@@ -911,7 +911,7 @@ if [ "$apache" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/mod_suphp//")
 	software=$(echo "$software" | sed -e "s/mod_fcgid//")
 	software=$(echo "$software" | sed -e "s/mod_ssl//")
-	software=$(echo "$software" | sed -e "s/php${php_v}-php.${arch}//")
+	software=$(echo "$software" | sed -e "s/php${php_v}-php//")
 	software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
 	mod_php="disable"
 fi
@@ -956,11 +956,11 @@ if [ "$mysql8" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/mysql-common//")
 fi
 if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
-	software=$(echo "$software" | sed -e "s/php${php_v}-php-mysql.${arch}//")
+	software=$(echo "$software" | sed -e "s/php${php_v}-php-mysql//")
 fi
 if [ "$postgresql" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/postgresql-server//")
-	software=$(echo "$software" | sed -e "s/php${php_v}-php-pgsql.${arch}//")
+	software=$(echo "$software" | sed -e "s/php${php_v}-php-pgsql//")
 	software=$(echo "$software" | sed -e "s/phppgadmin//")
 	php_modules_install=$(echo "$php_modules_install" | sed -e "s/pgsql//")
 	php_modules_install=$(echo "$php_modules_install" | sed -e "s/pdo_pgsql//")
@@ -974,12 +974,12 @@ if [ "$iptables" = 'no' ]; then
 	software=$(echo "$software" | sed -e "s/fail2ban//")
 fi
 if [ "$phpfpm" = 'yes' ]; then
-	software=$(echo "$software" | sed -e "s/php${php_v}-php-cgi.${arch}//")
+	software=$(echo "$software" | sed -e "s/php${php_v}-php-cgi//")
 	software=$(echo "$software" | sed -e "s/httpd-itk//")
 	software=$(echo "$software" | sed -e "s/mod_ruid2 //")
 	software=$(echo "$software" | sed -e "s/mod_suphp//")
 	software=$(echo "$software" | sed -e "s/mod_fcgid//")
-	software=$(echo "$software" | sed -e "s/php${php_v}-php.${arch}//")
+	software=$(echo "$software" | sed -e "s/php${php_v}-php//")
 	software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
 	mod_php="disable"
 fi
@@ -1478,7 +1478,9 @@ if [ "$apache" = 'yes' ]; then
         if [ -e /etc/httpd/conf.dmod_suphp.conf ]; then
             cp /etc/httpd/conf.d/mod_suphp.conf /etc/httpd/conf.h.d/mod_suphp.conf
         fi
-        ln -s "/etc/httpd/conf.d.prep/php${php_v}.conf" /etc/httpd/conf.modules.d/09-mod-php.conf
+        if [ -e "/etc/httpd/conf.d.prep/php${php_v}.conf" ]; then
+            ln -s "/etc/httpd/conf.d.prep/php${php_v}.conf" /etc/httpd/conf.modules.d/09-mod-php.conf
+        fi
 
 	fi
 
diff --git a/src/rpm/hestia/hestia.spec b/src/rpm/hestia/hestia.spec
index ba23658..d6c8df1 100644
--- a/src/rpm/hestia/hestia.spec
+++ b/src/rpm/hestia/hestia.spec
@@ -3,7 +3,7 @@
 
 Name:              hestia
 Version:           1.9.6
-Release:           7%{dist}
+Release:           8%{dist}
 Summary:           Hestia Control Panel
 Group:             System Environment/Base
 License:           GPLv3
@@ -184,7 +184,7 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
-* Fri Mar 27 2026 Alexey Berezhok <a@bayrepo.ru> - 1.9.6-7
+* Fri Mar 27 2026 Alexey Berezhok <a@bayrepo.ru> - 1.9.6-8
 - Fixed installation of panel without PHP-FPM
 - Fixed mod_php, fcgid, fcgi mode