Compare commits
2 Commits
aae561716c
...
75df7a2554
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
75df7a2554 | ||
|
|
479a65e0dd |
@@ -425,14 +425,18 @@ add_web_config() {
|
|||||||
|
|
||||||
MOD_CONF="/etc/httpd/conf.modules.d/09-mod-php.conf"
|
MOD_CONF="/etc/httpd/conf.modules.d/09-mod-php.conf"
|
||||||
PHP_DEFAULT="/usr/bin/php-cgi"
|
PHP_DEFAULT="/usr/bin/php-cgi"
|
||||||
|
if [ -e $MOD_CONF ]; then
|
||||||
php_ver=$(grep -m1 '^LoadModule php_module ' "$MOD_CONF" | grep -oP 'php\d{2}')
|
php_ver=$(grep -m1 '^LoadModule php_module ' "$MOD_CONF" | grep -oP 'php\d{2}')
|
||||||
|
else
|
||||||
|
php_ver=$(find /etc/httpd/conf.modules.d -maxdepth 1 -type f -name '*-php*-php.conf' -print -quit | sed -n 's/.*-\(php[0-9]\+\)-php\.conf$/\1/p')
|
||||||
|
fi
|
||||||
php_cgi_path=$PHP_DEFAULT
|
php_cgi_path=$PHP_DEFAULT
|
||||||
|
|
||||||
if [ -n "$php_ver" ]; then
|
if [ -n "$php_ver" ]; then
|
||||||
if [ -n "$php_type" ]; then
|
if [ -n "$php_type" ]; then
|
||||||
php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
|
php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
|
||||||
else
|
else
|
||||||
php_cgi_path="/etc/opt/remi/php${php_ver}/bin/php-cgi"
|
php_cgi_path="/opt/remi/${php_ver}/root/bin/php-cgi"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -911,7 +911,7 @@ if [ "$apache" = 'no' ]; then
|
|||||||
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
||||||
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
||||||
software=$(echo "$software" | sed -e "s/mod_ssl//")
|
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//")
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
||||||
mod_php="disable"
|
mod_php="disable"
|
||||||
fi
|
fi
|
||||||
@@ -956,11 +956,11 @@ if [ "$mysql8" = 'no' ]; then
|
|||||||
software=$(echo "$software" | sed -e "s/mysql-common//")
|
software=$(echo "$software" | sed -e "s/mysql-common//")
|
||||||
fi
|
fi
|
||||||
if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
|
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
|
fi
|
||||||
if [ "$postgresql" = 'no' ]; then
|
if [ "$postgresql" = 'no' ]; then
|
||||||
software=$(echo "$software" | sed -e "s/postgresql-server//")
|
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//")
|
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/pgsql//")
|
||||||
php_modules_install=$(echo "$php_modules_install" | sed -e "s/pdo_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//")
|
software=$(echo "$software" | sed -e "s/fail2ban//")
|
||||||
fi
|
fi
|
||||||
if [ "$phpfpm" = 'yes' ]; then
|
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/httpd-itk//")
|
||||||
software=$(echo "$software" | sed -e "s/mod_ruid2 //")
|
software=$(echo "$software" | sed -e "s/mod_ruid2 //")
|
||||||
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
software=$(echo "$software" | sed -e "s/mod_suphp//")
|
||||||
software=$(echo "$software" | sed -e "s/mod_fcgid//")
|
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//")
|
software=$(echo "$software" | sed -e "s/brepo-php${php_v}-mod-apache//")
|
||||||
mod_php="disable"
|
mod_php="disable"
|
||||||
fi
|
fi
|
||||||
@@ -1478,7 +1478,9 @@ if [ "$apache" = 'yes' ]; then
|
|||||||
if [ -e /etc/httpd/conf.dmod_suphp.conf ]; 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
|
cp /etc/httpd/conf.d/mod_suphp.conf /etc/httpd/conf.h.d/mod_suphp.conf
|
||||||
fi
|
fi
|
||||||
|
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
|
ln -s "/etc/httpd/conf.d.prep/php${php_v}.conf" /etc/httpd/conf.modules.d/09-mod-php.conf
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -43,12 +43,5 @@
|
|||||||
|
|
||||||
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
|
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
|
||||||
IncludeOptional /etc/httpd/conf.h.d/*.inc
|
IncludeOptional /etc/httpd/conf.h.d/*.inc
|
||||||
<IfModule mod_ruid2.c>
|
|
||||||
RMode config
|
|
||||||
RUidGid %user% %group%
|
|
||||||
RGroups apache
|
|
||||||
</IfModule>
|
|
||||||
<IfModule mpm_itk.c>
|
|
||||||
AssignUserID %user% %group%
|
|
||||||
</IfModule>
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|||||||
@@ -38,12 +38,5 @@
|
|||||||
</Directory>
|
</Directory>
|
||||||
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
|
IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
|
||||||
IncludeOptional /etc/httpd/conf.h.d/*.inc
|
IncludeOptional /etc/httpd/conf.h.d/*.inc
|
||||||
<IfModule mod_ruid2.c>
|
|
||||||
RMode config
|
|
||||||
RUidGid %user% %group%
|
|
||||||
RGroups apache
|
|
||||||
</IfModule>
|
|
||||||
<IfModule mpm_itk.c>
|
|
||||||
AssignUserID %user% %group%
|
|
||||||
</IfModule>
|
|
||||||
</VirtualHost>
|
</VirtualHost>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: hestia
|
Name: hestia
|
||||||
Version: 1.9.6
|
Version: 1.9.6
|
||||||
Release: 7%{dist}
|
Release: 8%{dist}
|
||||||
Summary: Hestia Control Panel
|
Summary: Hestia Control Panel
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
License: GPLv3
|
License: GPLv3
|
||||||
@@ -184,7 +184,7 @@ fi
|
|||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%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 installation of panel without PHP-FPM
|
||||||
- Fixed mod_php, fcgid, fcgi mode
|
- Fixed mod_php, fcgid, fcgi mode
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user