Consolidate in /var/run

func/osal_rhel_based.sh

@@ -91,7 +91,7 @@ OSAL_CMD_PACKAGE_MANAGER=/usr/bin/dnf
 
 # Misc. paths
 OSAL_PATH_LOGROTATE_CONF_D=/etc/logrotate.d
-OSAL_PATH_RUN=/run
+OSAL_PATH_RUN=/var/run
 
 #-------------------------------------------------------------------#
 # Functions                                                         #

install/deb/multiphp/apache2/PHP-56.sh

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

install/deb/multiphp/apache2/PHP-70.sh

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

install/deb/multiphp/apache2/PHP-71.sh

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

install/deb/multiphp/apache2/PHP-72.sh

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

install/deb/multiphp/apache2/PHP-73.sh

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

install/deb/multiphp/apache2/PHP-74.sh

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

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

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

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

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

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

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

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

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

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

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

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

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

install/deb/php-fpm/multiphp.tpl

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

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

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

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

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-70.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-71.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-72.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-73.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-74.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-56.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-70.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-71.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-72.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-73.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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-74.sh

@@ -8,7 +8,7 @@ docroot="$5"
 
 pool_conf="[$2]
 
-listen = /run/php-fpm/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/nginx/nginx.conf

@@ -3,7 +3,7 @@ user                    apache;
 worker_processes        auto;
 worker_rlimit_nofile    65535;
 error_log               /var/log/nginx/error.log;
-pid                     /run/nginx.pid;
+pid                     /var/run/nginx.pid;
 
 # Worker config
 events {

install/rhel/php-fpm/multiphp.tpl

@@ -1,7 +1,7 @@
 ; origin-src: deb/php-fpm/multiphp.tpl
 
 [%domain%]
-listen = /run/php-fpm/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: deb/templates/web/php-fpm/default.tpl
 
 [%backend%]
-listen = /run/php-fpm/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

src/rpm/nginx/hestia-nginx.service

@@ -6,10 +6,10 @@ After=hestia-php.service
 
 [Service]
 Type=forking
-PIDFile=/var/hestia-nginx.pid
+PIDFile=/var/run/hestia-nginx.pid
 ExecStart=/usr/local/hestia/nginx/sbin/nginx -c /usr/local/hestia/nginx/conf/nginx.conf
-ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/hestia-nginx.pid)"
-ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/hestia-nginx.pid)"
+ExecReload=/bin/sh -c "/bin/kill -s HUP $(/bin/cat /var/run/hestia-nginx.pid)"
+ExecStop=/bin/sh -c "/bin/kill -s TERM $(/bin/cat /var/run/hestia-nginx.pid)"
 
 [Install]
 WantedBy=hestia.service

src/rpm/nginx/nginx.conf

@@ -3,7 +3,7 @@ user                    admin;
 worker_processes        1;
 worker_rlimit_nofile    65535;
 error_log               /usr/local/hestia/log/nginx-error.log;
-pid                     /run/hestia-nginx.pid;
+pid                     /var/run/hestia-nginx.pid;
 
 # Worker config
 events {

src/rpm/php/php-fpm.conf

@@ -1,5 +1,5 @@
 [global]
-pid = /run/hestia-php.pid
+pid = /var/run/hestia-php.pid
 daemonize = yes
 log_level = error
 emergency_restart_threshold = 10
@@ -8,7 +8,7 @@ process_control_timeout = 10s
 events.mechanism = epoll
 
 [www]
-listen = /run/hestia-php.sock
+listen = /var/run/hestia-php.sock
 
 user = admin
 group = admin