Merge branch 'main' of https://git.stellarisei.ru/hoshimach1/autoinstall

install.sh

@@ -581,27 +581,48 @@ proceed_with_installation() {
     APACHE_CONF="/etc/apache2/sites-available/000-default.conf"
     WEBSERVER_USER="www-data"
     
-    elif [ "$DISTRO_FAMILY" = "rhel" ]; then
+elif [ "$DISTRO_FAMILY" = "rhel" ]; then
     WEBROOT="/var/www/html"
     APACHE_CONF="/etc/httpd/conf.d/000-default.conf"
     WEBSERVER_USER="apache"
     
     rm -f /etc/httpd/conf.d/php.conf
     
+    log_info "Настройка PHP-FPM для Apache..."
+    
     if [ "$DISTRO" = "fedora" ]; then
-            cat > "/etc/httpd/conf.d/php.conf" << 'EOF'
-LoadModule php_module modules/libphp.so
+        cat > "/etc/httpd/conf.d/php-fpm.conf" << 'EOF'
+LoadModule proxy_module modules/mod_proxy.so
+LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
 LoadModule rewrite_module modules/mod_rewrite.so
 
 <FilesMatch \.php$>
-    SetHandler application/x-httpd-php
+    SetHandler "proxy:fcgi://127.0.0.1:9000"
 </FilesMatch>
 
-DirectoryIndex index.php index.html
-EOF
-        else
-            log_info "Настройка PHP-FPM для Apache..."
+DirectoryIndex index.php index.html index.htm
 
+<Files "*.php">
+    Require all granted
+</Files>
+EOF
+        
+        if [ -f "/etc/php-fpm.d/www.conf" ]; then
+            PHP_FPM_CONF="/etc/php-fpm.d/www.conf"
+            
+            cp "$PHP_FPM_CONF" "${PHP_FPM_CONF}.backup.$(date +%Y%m%d_%H%M%S)"
+            
+            sed -i 's/^user = .*/user = apache/' "$PHP_FPM_CONF"
+            sed -i 's/^group = .*/group = apache/' "$PHP_FPM_CONF"
+            sed -i 's/^listen = .*/listen = 127.0.0.1:9000/' "$PHP_FPM_CONF"
+            
+            log_info "PHP-FPM пул настроен для Fedora"
+            
+            systemctl enable php-fpm >/dev/null 2>&1
+            systemctl start php-fpm >/dev/null 2>&1
+        fi
+        
+    else
         cat > "/etc/httpd/conf.d/php-fpm.conf" << 'EOF'
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_fcgi_module modules/mod_proxy_fcgi.so
@@ -631,13 +652,13 @@ EOF
             sed -i 's/^;listen.group = .*/listen.group = apache/' "$PHP_FPM_CONF"
             sed -i 's/^;listen.mode = .*/listen.mode = 0660/' "$PHP_FPM_CONF"
             
-                log_info "PHP-FPM пул настроен"
+            log_info "PHP-FPM пул настроен для RHEL/CentOS"
         fi
         
         mkdir -p /var/opt/remi/php83/run/php-fpm
         chown apache:apache /var/opt/remi/php83/run/php-fpm
     fi
-    fi
+fi
     log_success "Модули Apache настроены"
 
     log_step "Создание конфигурации виртуального хоста..."