Added support ansible instead of puppet

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.9.6.rpm] - Release
+
+- Fix error on all web and mail domains after Apache 2.4.64 update
+- Fix error on local php installation and extension activation
+- Added templates for nginx mod_rewrite activation
+- Added nginx with mod_rewrite
+- Fixed database size usage and disk usage output on the info pages
+- Fixed installation of panel without PHP-FPM
+- Fixed mod_php, fcgid, fcgi mode
+
 ## [1.9.5.rpm] - Release
 
 - Added support installation of alternative php not only remi

bin/v-add-web-php

@@ -84,10 +84,10 @@ if [ "$LOCAL_PHP" == "yes" ]; then
 	fi
 else
 	# Packages in Remi repo have names with php$version-php- prefixes
-	mph="php$version-php-fpm php$version-php-cgi php$version-php-mysqlnd php$version-php-pgsql 
-		php$version-php-pdo php$version-php-common php$version-php-pecl-imagick php$version-php-imap 
-		php$version-php-ldap php$version-php-pecl-apcu php$version-php-pecl-zip php$version-php-cli 
-		php$version-php-opcache php$version-php-xml php$version-php-gd php$version-php-intl 
+	mph="php$version-php-fpm php$version-php-cgi php$version-php-mysqlnd php$version-php-pgsql
+		php$version-php-pdo php$version-php-common php$version-php-pecl-imagick php$version-php-imap
+		php$version-php-ldap php$version-php-pecl-apcu php$version-php-pecl-zip php$version-php-cli
+		php$version-php-opcache php$version-php-xml php$version-php-gd php$version-php-intl
 		php$version-php-mbstring php$version-php-pspell php$version-php-readline"
 	if [ "$version" = "56" ]; then
 		mph=$(sed -e "s/php$version-php-pecl-apcu//")
@@ -156,23 +156,15 @@ else
 fi
 
 # Check if required modules for apache2 are enabled
-if [ "$WEB_SYSTEM" = "apache2" ]; then
-	if [ -f /etc/redhat-release ]; then
-		if ! httpd -M | grep 'proxy_fcgi_module' ; then
-			sed 's/#LoadModule proxy_fcgi_module/LoadModule proxy_fcgi_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
-			sed 's/#LoadModule proxy_module/LoadModule proxy_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
-		fi
-		if ! httpd -M | grep 'setenvif_module' ; then
-			sed 's/#LoadModule setenvif_module/LoadModule setenvif_module/' -i /etc/httpd/conf.modules.d/00-base.conf
-		fi
-	else
-		if ! a2query -q -m proxy_fcgi; then
-			a2enmod -q proxy_fcgi
-		fi
-		if ! a2query -q -m setenvif; then
-			a2enmod -q setenvif
-		fi
+if [ "$WEB_SYSTEM" = "httpd" ]; then
+	if ! httpd -M | grep 'proxy_fcgi_module' ; then
+		sed 's/#LoadModule proxy_fcgi_module/LoadModule proxy_fcgi_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
+		sed 's/#LoadModule proxy_module/LoadModule proxy_module/' -i /etc/httpd/conf.modules.d/00-proxy.conf
 	fi
+	if ! httpd -M | grep 'setenvif_module' ; then
+		sed 's/#LoadModule setenvif_module/LoadModule setenvif_module/' -i /etc/httpd/conf.modules.d/00-base.conf
+	fi
+
 	$BIN/v-restart-web "yes"
 fi
 

docs/docs/extensions/extended-modules.md

@@ -148,4 +148,4 @@ bundle install
 bundle install --path=vendor
 ```
 
-для установки пользователю необходимых гемов локально.
+для установки пользователю необходимых гемов локально.

func/domain.sh

@@ -102,7 +102,7 @@ prepare_web_backend() {
 	# Accept first function argument as backend template otherwise fallback to $template global variable
 	local backend_template=${1:-$template}
 	php_type=$(cat "$HESTIA/conf/hestia.conf" | grep "LOCAL_PHP" | grep "yes")
-	
+
 	if [ -n "$php_type" ]; then
 		pool=$(find -L /opt/brepo/ -name "$domain.conf" -exec dirname {} \; 2>/dev/null)
 	else
@@ -359,7 +359,7 @@ add_web_config() {
 			-e "s|%ssl_ca%|$ssl_ca|g" \
 			-e "s|%docrtpriv%|$docrtpriv|g" \
 			> $conf
-	
+
 	if [ "$TPLNM" == "srvproxy.tpl" -o "$TPLNM" == "srvproxy.stpl" ];then
 		proxy_backend_port_internal=$(convert_proxy_ngix_internal_redirect "$3")
 		cat "$conf" \
@@ -419,11 +419,41 @@ add_web_config() {
 		done
 	fi
 
+	#----
+
+	php_type=$(cat "$HESTIA/conf/hestia.conf" | grep "LOCAL_PHP" | grep "yes")
+
+	MOD_CONF="/etc/httpd/conf.modules.d/09-mod-php.conf"
+	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}')
+	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
+
+	if [ -n "$php_ver" ]; then
+    	if [ -n "$php_type" ]; then
+    		php_cgi_path="/opt/brepo/${php_ver}/bin/php-cgi"
+    	else
+    		php_cgi_path="/opt/remi/${php_ver}/root/bin/php-cgi"
+    	fi
+	fi
+
+	if [[ -x "$php_cgi_path" ]]; then
+        :
+	else
+	    php_cgi_path=$PHP_DEFAULT
+	fi
+
+	#----
+
 	trigger="${TPLNM/.*pl/.sh}"
 	if [ -x "${WEBTPL_LOCATION}/$trigger" ]; then
 		$WEBTPL_LOCATION/$trigger \
 			$user $domain $local_ip $HOMEDIR \
-			$HOMEDIR/$user/web/$domain/public_html
+			$HOMEDIR/$user/web/$domain/public_html \
+			$php_cgi_path
 	fi
 }
 

func_ruby/ext-modules/passenger_manager.mod

@@ -20,15 +20,15 @@ class PassengerWorker < Kernel::ModuleCoreWorker
       ID: 2,
       NAME: MODULE_ID,
       DESCR: "Added passenger support for nginx",
-      REQ: "puppet_installer",
+      REQ: "",
       CONF: "yes",
     }
   end
 
   def enable
     log_file = get_log
-    f_inst_pp = get_module_paydata("passenger_installer.pp")
-    f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
+    f_inst_pp = get_module_paydata("passenger_installer.yml")
+    f_uninst_pp = get_module_paydata("passenger_uninstaller.yml")
     if !check
       inf = info
       log("Req error, needed #{inf[:REQ]}")
@@ -36,16 +36,16 @@ class PassengerWorker < Kernel::ModuleCoreWorker
     else
       begin
         prepare_default_ruby_conf
-        log("install packages for passenger + nginx support: /usr/bin/puppet apply --detailed-exitcodes #{f_inst_pp}")
-        result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_inst_pp}" 2>&1`
+        log("install packages for passenger + nginx support: /usr/bin/ansible-playbook -vv #{f_inst_pp}")
+        result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_inst_pp}" 2>&1`
         ex_status = $?.exitstatus
         if ex_status.to_i == 0 || ex_status.to_i == 2
           log(result_action)
           super
         else
           log(result_action)
-          log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
-          result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}" 2>&1`
+          log("Try to disable action: /usr/bin/ansible-playbook -vv #{f_uninst_pp}")
+          result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_uninst_pp}" 2>&1`
           "module installation error. See log #{log_file}"
         end
       rescue => e
@@ -57,14 +57,14 @@ class PassengerWorker < Kernel::ModuleCoreWorker
 
   def disable
     log_file = get_log
-    f_uninst_pp = get_module_paydata("passenger_uninstaller.pp")
+    f_uninst_pp = get_module_paydata("passenger_uninstaller.yml")
     if !check_domains_with_passenger
       return log_return("Presents domains with passenger support disable it first")
     end
     begin
       log("uninstall packages for passenger + nginx support")
-      log("Try to disable action: /usr/bin/puppet apply --detailed-exitcodes #{f_uninst_pp}")
-      result_action = `/usr/bin/puppet apply --detailed-exitcodes "#{f_uninst_pp}" 2>&1`
+      log("Try to disable action: /usr/bin/ansible-playbook -vv #{f_uninst_pp}")
+      result_action = `LC_ALL=C.UTF-8 /usr/bin/ansible-playbook -vv "#{f_uninst_pp}" 2>&1`
       ex_status = $?.exitstatus
       if ex_status.to_i == 0 || ex_status.to_i == 2
         log(result_action)

func_ruby/ext-modules/payload/passenger_manager/passenger_installer.yml

@@ -0,0 +1,69 @@
+---
+- name: Install Passenger and configure Nginx on localhost
+  hosts: localhost
+  connection: local
+  become: true
+  gather_facts: false
+  environment:
+    LANG: en_US.UTF-8
+    LC_ALL: en_US.UTF-8
+  tasks:
+    # Устанавливаем Ruby и зависимости
+    - name: Install rubygems-devel
+      ansible.builtin.dnf:
+        name: rubygems-devel
+        state: present
+    - name: Install rubygem-rake
+      ansible.builtin.dnf:
+        name: rubygem-rake
+        state: present
+    - name: Install ruby-devel
+      ansible.builtin.dnf:
+        name: ruby-devel
+        state: present
+    - name: Install rubygem-rack
+      ansible.builtin.dnf:
+        name: rubygem-rack
+        state: present
+    - name: Install alt-brepo-ruby33-devel
+      ansible.builtin.dnf:
+        name: alt-brepo-ruby33-devel
+        state: present
+    - name: Install alt-brepo-ruby33-rubygem-rake
+      ansible.builtin.dnf:
+        name: alt-brepo-ruby33-rubygem-rake
+        state: present
+    # Устанавливаем Passenger и модуль Nginx
+    - name: Install passenger-devel
+      ansible.builtin.dnf:
+        name: passenger-devel
+        state: present
+    - name: Install passenger
+      ansible.builtin.dnf:
+        name: passenger
+        state: present
+    - name: Install nginx-mod-http-passenger
+      ansible.builtin.dnf:
+        name: nginx-mod-http-passenger
+        state: present
+    # Конфигурируем Nginx для Passenger
+    - name: Create passenger.conf
+      ansible.builtin.copy:
+        dest: /etc/nginx/conf.d/passenger.conf
+        content: |
+          passenger_root /usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini;
+          passenger_ruby /usr/bin/ruby;
+          passenger_instance_registry_dir /var/run/passenger-instreg;
+          passenger_user_switching on;
+          passenger_env_var PASSENGER_COMPILE_NATIVE_SUPPORT_BINARY 0;
+          passenger_env_var PASSENGER_DOWNLOAD_NATIVE_SUPPORT_BINARY 0;
+    - name: Create passenger_includer.conf
+      ansible.builtin.copy:
+        dest: /etc/nginx/conf.d/main/passenger.conf
+        content: |
+          load_module modules/ngx_http_passenger_module.so;
+    # Перезапускаем Nginx
+    - name: Restart nginx service
+      ansible.builtin.service:
+        name: nginx
+        state: restarted

func_ruby/ext-modules/payload/passenger_manager/passenger_uninstaller.yml

@@ -0,0 +1,38 @@
+---
+- name: Uninstall Passenger and configure Nginx on localhost
+  hosts: localhost
+  connection: local
+  become: true
+  gather_facts: false
+  environment:
+    LANG: en_US.UTF-8
+    LC_ALL: en_US.UTF-8
+  tasks:
+    # Удалаем модуль nginx-passenger
+    - name: Remove nginx-mod-http-passenger package
+      ansible.builtin.dnf:
+        name: nginx-mod-http-passenger
+        state: absent
+    # Удалаем passenger и зависимости
+    - name: Remove passenger-devel package
+      ansible.builtin.dnf:
+        name: passenger-devel
+        state: absent
+    - name: Remove passenger package
+      ansible.builtin.dnf:
+        name: passenger
+        state: absent
+    # Удаляем конфигурационные файлы Nginx
+    - name: Remove passenger.conf
+      ansible.builtin.file:
+        path: /etc/nginx/conf.d/passenger.conf
+        state: absent
+    - name: Remove passenger_includer.conf
+      ansible.builtin.file:
+        path: /etc/nginx/conf.d/main/passenger.conf
+        state: absent
+    # Перезапускаем Nginx (необязательно, но полезно)
+    - name: Restart nginx service
+      ansible.builtin.service:
+        name: nginx
+        state: restarted

install/hst-install.sh

@@ -753,7 +753,7 @@ if [ "$uselocalphp" == "yes" ]; then
 	php_pkgs_lst="brepo-php${php_v} brepo-php${php_v}-mod-apache"
 else
 	write_config_value "LOCAL_PHP" "no"
-	php_pkgs_lst="php${php_v}-php.${arch} php${php_v}-php-cgi.${arch} php${php_v}-php-mysqlnd.${arch} php${php_v}-php-pgsql.${arch}
+	php_pkgs_lst="php${php_v}-php php${php_v}-php-cgi php${php_v}-php-mysqlnd php${php_v}-php-pgsql
   php${php_v}-php-pdo php${php_v}-php-common php${php_v}-php-pecl-imagick php${php_v}-php-imap php${php_v}-php-ldap
   php${php_v}-php-pecl-apcu php${php_v}-php-pecl-zip php${php_v}-php-cli php${php_v}-php-opcache php${php_v}-php-xml
   php${php_v}-php-gd php${php_v}-php-intl php${php_v}-php-mbstring php${php_v}-php-pspell php${php_v}-php-readline"
@@ -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
@@ -1456,11 +1456,32 @@ if [ "$apache" = 'yes' ]; then
 
 	# IDK why those modules still here, but ok. if they are disabled by default
 
-	if [ -e /etc/httpd/conf.modules.d/01-suexec.conf ]; then
-		sed 's/^LoadModule suexec_module/#LoadModule suexec_module/' -i /etc/httpd/conf.modules.d/01-suexec.conf
-	fi
-	if [ -e /etc/httpd/conf.modules.d/10-fcgid.conf ]; then
-		sed 's/^LoadModule fcgid_module/#LoadModule fcgid_module/' -i /etc/httpd/conf.modules.d/10-fcgid.conf
+	if [ "$phpfpm" = 'yes' ]; then
+    	if [ -e /etc/httpd/conf.modules.d/01-suexec.conf ]; then
+    		sed 's/^LoadModule suexec_module/#LoadModule suexec_module/' -i /etc/httpd/conf.modules.d/01-suexec.conf
+    	fi
+    	if [ -e /etc/httpd/conf.modules.d/10-fcgid.conf ]; then
+    		sed 's/^LoadModule fcgid_module/#LoadModule fcgid_module/' -i /etc/httpd/conf.modules.d/10-fcgid.conf
+    	fi
+    else
+        cp -f $HESTIA_INSTALL_DIR/httpd/01-mpm-itk.conf /etc/httpd/conf.modules.d/
+        if [ -e /etc/httpd/conf.modules.d/01-suexec.conf ]; then
+       		sed 's/#LoadModule suexec_module/LoadModule suexec_module/' -i /etc/httpd/conf.modules.d/01-suexec.conf
+       	fi
+        echo "LoadModule suphp_module modules/mod_suphp.so" > /etc/httpd/conf.modules.d/10-suphp.conf
+       	if [ -e /etc/httpd/conf.modules.d/10-fcgid.conf ]; then
+       		sed 's/#LoadModule fcgid_module/LoadModule fcgid_module/' -i /etc/httpd/conf.modules.d/10-fcgid.conf
+       	fi
+        if [ -e /etc/httpd/conf.d/fcgid.conf ]; then
+            cp /etc/httpd/conf.d/fcgid.conf /etc/httpd/conf.h.d/fcgid.conf
+        fi
+        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
+        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
 
 	# Switch status loader to custom one
@@ -1474,6 +1495,10 @@ if [ "$apache" = 'yes' ]; then
 		sed 's/LoadModule mpm_prefork_module/#LoadModule mpm_prefork_module/' -i /etc/httpd/conf.modules.d/00-mpm.conf
 		sed 's/#LoadModule mpm_event_module/LoadModule mpm_event_module/' -i /etc/httpd/conf.modules.d/00-mpm.conf
 		cp -f $HESTIA_INSTALL_DIR/httpd/hestia-event.conf /etc/httpd/conf.h.d/
+	else
+        sed 's/LoadModule mpm_worker_module/#LoadModule mpm_worker_module/' -i /etc/httpd/conf.modules.d/00-mpm.conf
+        sed 's/LoadModule mpm_event_module/#LoadModule mpm_event_module/' -i /etc/httpd/conf.modules.d/00-mpm.conf
+        sed 's/#LoadModule mpm_prefork_module/LoadModule mpm_prefork_module/' -i /etc/httpd/conf.modules.d/00-mpm.conf
 	fi
 
 	if [ ! -d /etc/httpd/sites-available ]; then

install/rpm/httpd/01-mpm-itk.conf

@@ -0,0 +1,3 @@
+<IfModule mpm_prefork_module>
+LoadModule mpm_itk_module modules/mod_mpm_itk.so
+</IfModule>

install/rpm/templates/web/httpd/default.stpl

@@ -18,6 +18,13 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
     <Directory %sdocroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI

install/rpm/templates/web/httpd/default.tpl

@@ -21,6 +21,13 @@
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
 
     <Directory %docroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
         php_admin_value open_basedir %docroot%:%home%/%user%/tmp

install/rpm/templates/web/httpd/forbidden.stpl

@@ -0,0 +1,41 @@
+#=========================================================================#
+# Default Web Domain Template                                             #
+# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+# https://hestiacp.com/docs/server-administration/web-templates.html      #
+#=========================================================================#
+
+<VirtualHost %ip%:%web_ssl_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %sdocroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    <Location />
+        Require all denied
+    </Location>
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile %ssl_crt%
+    SSLCertificateKeyFile %ssl_key%
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+
+    <IfModule mod_ruid2.c>
+        RMode config
+        RUidGid %user% %group%
+        RGroups apache
+    </IfModule>
+    <IfModule mpm_itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
+    IncludeOptional /etc/httpd/conf.h.d/*.inc
+</VirtualHost>

install/rpm/templates/web/httpd/forbidden.tpl

@@ -0,0 +1,38 @@
+#=========================================================================#
+# Default Web Domain Template                                             #
+# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+# https://hestiacp.com/docs/server-administration/web-templates.html      #
+#=========================================================================#
+
+<VirtualHost %ip%:%web_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
+
+    <Location />
+        Require all denied
+    </Location>
+
+    <IfModule mod_ruid2.c>
+        RMode config
+        RUidGid %user% %group%
+        RGroups apache
+    </IfModule>
+    <IfModule mpm_itk.c>
+        AssignUserID %user% %group%
+    </IfModule>
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
+    IncludeOptional /etc/httpd/conf.h.d/*.inc
+</VirtualHost>

install/rpm/templates/web/httpd/hosting.stpl

@@ -18,6 +18,13 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
     <Directory %sdocroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI

install/rpm/templates/web/httpd/hosting.tpl

@@ -21,6 +21,13 @@
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
 
     <Directory %docroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
         php_admin_value upload_max_filesize 10M

install/rpm/templates/web/httpd/php-fpm/forbidden.stpl

@@ -0,0 +1,32 @@
+#=========================================================================#
+# Default Web Domain Template                                             #
+# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+# https://hestiacp.com/docs/server-administration/web-templates.html      #
+#=========================================================================#
+
+<VirtualHost %ip%:%web_ssl_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %sdocroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+    <Location />
+        Require all denied
+    </Location>
+
+    SSLEngine on
+    SSLVerifyClient none
+    SSLCertificateFile %ssl_crt%
+    SSLCertificateKeyFile %ssl_key%
+    %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
+    IncludeOptional /etc/httpd/conf.h.d/*.inc
+</VirtualHost>

install/rpm/templates/web/httpd/php-fpm/forbidden.tpl

@@ -0,0 +1,30 @@
+#=========================================================================#
+# Default Web Domain Template                                             #
+# DO NOT MODIFY THIS FILE! CHANGES WILL BE LOST WHEN REBUILDING DOMAINS   #
+# https://hestiacp.com/docs/server-administration/web-templates.html      #
+#=========================================================================#
+
+<VirtualHost %ip%:%web_port%>
+
+    ServerName %domain_idn%
+    %alias_string%
+    ServerAdmin %email%
+    DocumentRoot %docroot%
+    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    Alias /vstats/ %home%/%user%/web/%domain%/stats/
+    Alias /error/ %home%/%user%/web/%domain%/document_errors/
+    #SuexecUserGroup %user% %group%
+    CustomLog /var/log/%web_system%/domains/%domain%.bytes bytes
+    CustomLog /var/log/%web_system%/domains/%domain%.log combined
+    ErrorLog /var/log/%web_system%/domains/%domain%.error.log
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/apache2.forcessl.conf*
+
+    <Location />
+        Require all denied
+    </Location>
+
+
+    IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
+    IncludeOptional /etc/httpd/conf.h.d/*.inc
+</VirtualHost>

install/rpm/templates/web/httpd/phpcgi.sh

@@ -1,16 +1,26 @@
-#!/bin/bash
+#!/usr/bin/bash
 # Adding php wrapper
 user="$1"
 domain="$2"
 ip="$3"
 home_dir="$4"
 docroot="$5"
+php_path="$6"
 
-wrapper_script='#!/usr/bin/php-cgi -cphp5-cgi.ini'
+wrapper_script="#!$php_path -cphp5-cgi.ini"
 wrapper_file="$home_dir/$user/web/$domain/cgi-bin/php"
+wrapper_dir="/var/www/$user/$domain/cgi-bin"
+wrapper_file2="$wrapper_dir/php"
 
 echo "$wrapper_script" > $wrapper_file
 chown $user:$user $wrapper_file
 chmod -f 751 $wrapper_file
 
+mkdir -p $wrapper_dir
+
+echo "$wrapper_script" > $wrapper_file2
+chown $user:$user $wrapper_file2
+chown $user:$user $wrapper_dir
+chmod -f 751 $wrapper_file2
+
 exit 0

install/rpm/templates/web/httpd/phpcgi.stpl

@@ -10,7 +10,8 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %sdocroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    #ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    ScriptAlias /cgi-bin/ /var/www/%user%/%domain%/cgi-bin/
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%

install/rpm/templates/web/httpd/phpcgi.tpl

@@ -10,7 +10,8 @@
     %alias_string%
     ServerAdmin %email%
     DocumentRoot %docroot%
-    ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    #ScriptAlias /cgi-bin/ %home%/%user%/web/%domain%/cgi-bin/
+    ScriptAlias /cgi-bin/ /var/www/%user%/%domain%/cgi-bin/
     Alias /vstats/ %home%/%user%/web/%domain%/stats/
     Alias /error/ %home%/%user%/web/%domain%/document_errors/
     SuexecUserGroup %user% %group%

install/rpm/templates/web/httpd/phpfcgid.sh

@@ -1,22 +1,32 @@
-#!/bin/bash
+#!/usr/bin/bash
 # Adding php wrapper
 user="$1"
 domain="$2"
 ip="$3"
 home_dir="$4"
 docroot="$5"
+php_path="$6"
 
 wrapper_script="#!/bin/sh
 PHPRC=/usr/local/lib
 export PHPRC
 export PHP_FCGI_MAX_REQUESTS=1000
 export PHP_FCGI_CHILDREN=20
-exec  /usr/bin/php-cgi
+exec $php_path
 "
 wrapper_file="$home_dir/$user/web/$domain/cgi-bin/fcgi-starter"
+wrapper_dir="/var/www/$user/$domain/cgi-bin"
+wrapper_file2="$wrapper_dir/fcgi-starter"
 
 echo "$wrapper_script" > $wrapper_file
 chown $user:$user $wrapper_file
 chmod -f 751 $wrapper_file
 
+mkdir -p $wrapper_dir
+
+echo "$wrapper_script" > $wrapper_file2
+chown $user:$user $wrapper_file2
+chown $user:$user $wrapper_dir
+chmod -f 751 $wrapper_file2
+
 exit 0

install/rpm/templates/web/httpd/phpfcgid.stpl

@@ -28,7 +28,8 @@
         <Files *.php>
           SetHandler fcgid-script
         </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        #FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        FCGIWrapper /var/www/%user%/%domain%/cgi-bin/fcgi-starter .php
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
@@ -42,4 +43,5 @@
 
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.ssl.conf_*
     IncludeOptional /etc/httpd/conf.h.d/*.inc
+
 </VirtualHost>

install/rpm/templates/web/httpd/phpfcgid.tpl

@@ -30,11 +30,13 @@
         <Files *.php>
           SetHandler fcgid-script
         </Files>
-        FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        #FCGIWrapper %home%/%user%/web/%domain%/cgi-bin/fcgi-starter .php
+        FCGIWrapper /var/www/%user%/%domain%/cgi-bin/fcgi-starter .php
     </Directory>
     <Directory %home%/%user%/web/%domain%/stats>
         AllowOverride All
     </Directory>
     IncludeOptional %home%/%user%/conf/web/%domain%/%web_system%.conf_*
     IncludeOptional /etc/httpd/conf.h.d/*.inc
+
 </VirtualHost>

install/rpm/templates/web/httpd/www-data.stpl

@@ -19,6 +19,13 @@
     CustomLog /var/log/%web_system%/domains/%domain%.log combined
     ErrorLog /var/log/%web_system%/domains/%domain%.error.log
     <Directory %sdocroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         SSLRequireSSL
         Options +Includes -Indexes +ExecCGI

install/rpm/templates/web/httpd/www-data.tpl

@@ -22,6 +22,13 @@
     IncludeOptional %home%/%user%/conf/web/%domain%/forcessl.apache2.conf*
 
     <Directory %docroot%>
+        <FilesMatch ".+\.ph(ar|p|tml)$">
+	    SetHandler application/x-httpd-php
+	</FilesMatch>
+	<FilesMatch ".+\.phps$">
+	    SetHandler application/x-httpd-php-source
+	    Require all denied
+	</FilesMatch>
         AllowOverride All
         Options +Includes -Indexes +ExecCGI
         php_admin_value open_basedir %docroot%:%home%/%user%/tmp

src/rpm/hestia/hestia.spec

@@ -3,7 +3,7 @@
 
 Name:              hestia
 Version:           1.9.6
-Release:           5%{dist}
+Release:           9%{dist}
 Summary:           Hestia Control Panel
 Group:             System Environment/Base
 License:           GPLv3
@@ -36,8 +36,7 @@ Requires(post):    systemd
 Requires(preun):   systemd
 Requires(postun):  systemd
 Requires:          ruby
-Requires:          puppet
-Requires:          puppet-stdlib
+Requires:          ansible-core
 
 Provides:          hestia = %{version}-%{release}
 Conflicts:         redhat-release < 8
@@ -184,6 +183,16 @@ fi
 %{_tmpfilesdir}/%{name}.conf
 
 %changelog
+* Sun Mar 29 2026 Alexey Berezhok <a@bayrepo.ru> - 1.9.6-9
+- Added support ansible instead of puppet
+
+* 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
+
+* Thu Mar 26 2026 Alexey Berezhok <a@bayrepo.ru> - 1.9.6-6
+- Fixed database size usage and disk usage output on the info pages
+
 * Thu Mar 19 2026 Alexey Berezhok <a@bayrepo.ru> - 1.9.6-5
 - Added nginx with mod_rewrite
 - Added templates for nginx mod_rewrite activation

web/list/db/index.php

@@ -4,13 +4,17 @@ $TAB = "DB";
 // Main include
 include $_SERVER["DOCUMENT_ROOT"] . "/inc/main.php";
 
+//Update data before $output
+exec(HESTIA_CMD . "v-update-databases-disk $user", $output, $return_var);
+unset($output);
+
 // Data
 exec(HESTIA_CMD . "v-list-databases $user json", $output, $return_var);
 $data = json_decode(implode("", $output), true);
 if ($_SESSION["userSortOrder"] == "name") {
-	ksort($data);
+    ksort($data);
 } else {
-	$data = array_reverse($data, true);
+    $data = array_reverse($data, true);
 }
 unset($output);
 

web/list/web/index.php

@@ -4,13 +4,25 @@ $TAB = "WEB";
 // Main include
 include $_SERVER["DOCUMENT_ROOT"] . "/inc/main.php";
 
+//Update data before output
+exec(HESTIA_CMD . "v-update-web-domains-disk " . $user, $output, $return_var);
+unset($output);
+exec(HESTIA_CMD . "v-update-web-domains-stat " . $user, $output, $return_var);
+unset($output);
+exec(HESTIA_CMD . "v-update-web-domains-traff " . $user, $output, $return_var);
+unset($output);
+
 // Data
-exec(HESTIA_CMD . "v-list-web-domains " . $user . " 'json'", $output, $return_var);
+exec(
+    HESTIA_CMD . "v-list-web-domains " . $user . " 'json'",
+    $output,
+    $return_var,
+);
 $data = json_decode(implode("", $output), true);
 if ($_SESSION["userSortOrder"] == "name") {
-	ksort($data);
+    ksort($data);
 } else {
-	$data = array_reverse($data, true);
+    $data = array_reverse($data, true);
 }
 $ips = json_decode(shell_exec(HESTIA_CMD . "v-list-sys-ips json"), true);