Templates and paths

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

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /var/run/php-fpm/php5.6-fpm-$2.sock
+listen = /var/run/php/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-fpm/php5.6-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/run/php/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:/run/php-fpm/php5.6-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php7.0-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.0-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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:/run/php-fpm/php7.0-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php7.1-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.1-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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:/run/php-fpm/php7.1-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php7.2-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.2-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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:/run/php-fpm/php7.2-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php7.3-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.3-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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:/run/php-fpm/php7.3-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php7.4-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.4-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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:/run/php-fpm/php7.4-fpm-%domain%.sock|fcgi://localhost"
+        SetHandler "proxy:unix:/var/run/php/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-fpm/php5.6-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php5.6-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php5.6-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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-fpm/php7.0-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.0-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php7.0-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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-fpm/php7.1-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.1-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php7.1-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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-fpm/php7.2-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.2-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php7.2-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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-fpm/php7.3-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.3-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php7.3-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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-fpm/php7.4-fpm-$2.sock
+listen = /var/run/php/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:/run/php-fpm/php7.4-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/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:/run/php-fpm/php7.4-fpm-%domain%.sock;
+            fastcgi_pass    unix:/var/run/php/php7.4-fpm-%domain%.sock;
             fastcgi_index   index.php;
             include         /etc/nginx/fastcgi_params;
         }

install/rhel/php-fpm/dummy.conf

@@ -1,4 +1,4 @@
-; origin-src: deb/php-fpm/dummy.conf
+; origin-src: rhel/php-fpm/dummy.conf
 
 [www]
 listen = 127.0.0.1:9999

install/rhel/php-fpm/multiphp.tpl

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

install/rhel/php-fpm/www.conf

@@ -1,4 +1,4 @@
-; origin-src: deb/php-fpm/www.conf
+; origin-src: rhel/php-fpm/www.conf
 
 [www]
 listen = 127.0.0.1:9000

install/rhel/pma/apache.conf

@@ -26,7 +26,7 @@ Alias /%pma_alias% /usr/share/phpmyadmin
 	</IfDefine>
     <IfDefine !PHP_ENABLED>
         <FilesMatch \.php$>
-            SetHandler "proxy:unix:/run/php-fpm/www.sock|fcgi://localhost"
+            SetHandler "proxy:unix:/var/run/php/www.sock|fcgi://localhost"
         </FilesMatch>
     </IfDefine>
 

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

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