Use /var/run/php-fpm

bin/module/php-fpm/add.inc

@@ -48,8 +48,6 @@ hestia_module_php-fpm_add() {
 
     echo "Adding PHP (FPM) version ${php_version}..."
 
-    mkdir -p /var/run/php
-
     local php_prefix=$(osal_php_package_prefix $php_version)
 
     # Install php packages

bin/setup/init.inc

@@ -4,7 +4,7 @@ hestia_setup_init() {
     echo "Initializing Hestia configuration..."
     mkdir -p $HESTIA/conf $HESTIA/log $HESTIA/ssl $HESTIA/data/ips \
         $HESTIA/data/queue $HESTIA/data/users $HESTIA/data/firewall \
-        $HESTIA/data/sessions /var/run/php
+        $HESTIA/data/sessions
     touch $HESTIA/data/queue/backup.pipe $HESTIA/data/queue/disk.pipe \
         $HESTIA/data/queue/webstats.pipe $HESTIA/data/queue/restart.pipe \
         $HESTIA/data/queue/traffic.pipe $HESTIA/log/system.log \

install/rhel/multiphp/httpd/PHP-56.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php5.6-fpm-$2.sock
+listen = /var/run/php-fpm/php5.6-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-56.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/run/php-fpm/php5.6-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-56.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php5.6-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php5.6-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-70.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.0-fpm-$2.sock
+listen = /var/run/php-fpm/php7.0-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-70.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.0-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-70.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.0-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.0-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-71.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.1-fpm-$2.sock
+listen = /var/run/php-fpm/php7.1-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-71.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.1-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-71.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.1-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.1-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-72.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.2-fpm-$2.sock
+listen = /var/run/php-fpm/php7.2-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-72.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.2-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-72.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.2-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.2-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-73.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.3-fpm-$2.sock
+listen = /var/run/php-fpm/php7.3-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-73.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.3-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-73.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.3-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.3-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-74.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.4-fpm-$2.sock
+listen = /var/run/php-fpm/php7.4-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/httpd/PHP-74.stpl

@@ -26,7 +26,7 @@
     %ssl_ca_str%SSLCertificateChainFile %ssl_ca%
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.4-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/httpd/PHP-74.tpl

@@ -23,7 +23,7 @@
     </Directory>
 
     <FilesMatch \.php$>
-        SetHandler "proxy:unix:/var/run/php/php7.4-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php-fpm/php7.4-fpm-%domain%.sock|fcgi://localhost"
     </FilesMatch>
     SetEnvIf Authorization .+ HTTP_AUTHORIZATION=$0
 

install/rhel/multiphp/nginx/PHP-56.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php5.6-fpm-$2.sock
+listen = /var/run/php-fpm/php5.6-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-56.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php5.6-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php5.6-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-56.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php5.6-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php5.6-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-70.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.0-fpm-$2.sock
+listen = /var/run/php-fpm/php7.0-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-70.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.0-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.0-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-70.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.0-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.0-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-71.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.1-fpm-$2.sock
+listen = /var/run/php-fpm/php7.1-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-71.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.1-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.1-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-71.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.1-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.1-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-72.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.2-fpm-$2.sock
+listen = /var/run/php-fpm/php7.2-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-72.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.2-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.2-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-72.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.2-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.2-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-73.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.3-fpm-$2.sock
+listen = /var/run/php-fpm/php7.3-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-73.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.3-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.3-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-73.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.3-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.3-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-74.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php/php7.4-fpm-$2.sock
+listen = /var/run/php-fpm/php7.4-fpm-$2.sock
 listen.owner = $1
 listen.group = apache
 listen.mode = 0660

install/rhel/multiphp/nginx/PHP-74.stpl

@@ -27,7 +27,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.4-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.4-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/multiphp/nginx/PHP-74.tpl

@@ -22,7 +22,7 @@ server {
                 return  404;
             }
 
-            fastcgi_pass    unix:/var/run/php/php7.4-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php-fpm/php7.4-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/php-fpm/multiphp.tpl

@@ -1,7 +1,7 @@
 ; origin-src: rhel/php-fpm/multiphp.tpl
 
 [%domain%]
-listen = /var/run/php/php%backend_version%-fpm-%domain%.sock
+listen = /var/run/php-fpm/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
 listen.group = apache
 listen.mode = 0660

install/rhel/templates/web/php-fpm/default.tpl

@@ -1,7 +1,7 @@
 ; origin-src: rhel/templates/web/php-fpm/default.tpl
 
 [%backend%]
-listen = /var/run/php/php%backend_version%-fpm-%domain%.sock
+listen = /var/run/php-fpm/php%backend_version%-fpm-%domain%.sock
 listen.owner = %user%
 listen.group = apache
 listen.mode = 0660

install/rhel/templates/web/php-fpm/no-php.tpl

@@ -1,7 +1,7 @@
 ; origin-src: rhel/templates/web/php-fpm/no-php.tpl
 
 ;[%backend%]
-;listen = /var/run/php/%backend%.sock
+;listen = /var/run/php-fpm/%backend%.sock
 ;listen.owner = %user%
 ;listen.group = apache
 ;listen.mode = 0660

install/rhel/templates/web/php-fpm/socket.tpl

@@ -1,7 +1,7 @@
 ; origin-src: rhel/templates/web/php-fpm/socket.tpl
 
 [%backend%]
-listen = /var/run/php/%backend%.sock
+listen = /var/run/php-fpm/%backend%.sock
 listen.owner = %user%
 listen.group = apache
 listen.mode = 0660