From 9576ebb63da6f3e74e71e9f29e440881f1ed52d7 Mon Sep 17 00:00:00 2001 From: ftimme Date: Fri, 23 Sep 2011 09:25:30 +0000 Subject: [PATCH] Changed PHP-FPM socket directory from /var/run/php5-fpm to /var/lib/php5-fpm because /var/run is cleand up on reboot. --- install/dist/conf/centos52.conf.php | 2 +- install/dist/conf/centos53.conf.php | 2 +- install/dist/conf/debian40.conf.php | 2 +- install/dist/conf/debian60.conf.php | 2 +- install/dist/conf/fedora9.conf.php | 2 +- install/dist/conf/gentoo.conf.php | 2 +- install/dist/conf/opensuse110.conf.php | 2 +- install/dist/conf/opensuse112.conf.php | 2 +- install/tpl/server.ini.master | 2 +- server/scripts/create_daily_nginx_access_logs.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index d7292aa91e..d0e2f03e91 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -192,7 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc'; diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index d7292aa91e..d0e2f03e91 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -192,7 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc'; diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index d8f73055d7..fef0374133 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -204,7 +204,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //*Ufw $conf['ufw']['installed'] = false; diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php index 7d3abdaed4..f866d8a3f7 100644 --- a/install/dist/conf/debian60.conf.php +++ b/install/dist/conf/debian60.conf.php @@ -204,7 +204,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* OpenVZ $conf['openvz']['installed'] = false; diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 1cc7ef3ed7..b6c2dff7ef 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -192,7 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc'; diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php index a1895d9c46..ea40789aed 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -208,7 +208,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php5-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc/vlogger'; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index 4c8e6a0988..b1f7c87275 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -192,7 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc'; diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index d9bf91809c..aa274bc443 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -192,7 +192,7 @@ $conf['nginx']['php_fpm_init_script'] = 'php-fpm'; $conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini'; $conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm'; $conf['nginx']['php_fpm_start_port'] = 9010; -$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm'; +$conf['nginx']['php_fpm_socket_dir'] = '/var/lib/php5-fpm'; //* vlogger $conf['vlogger']['config_dir'] = '/etc'; diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master index fe00c30e6e..469823c6b3 100644 --- a/install/tpl/server.ini.master +++ b/install/tpl/server.ini.master @@ -67,7 +67,7 @@ php_fpm_init_script=php5-fpm php_fpm_ini_path=/etc/php5/fpm/php.ini php_fpm_pool_dir=/etc/php5/fpm/pool.d php_fpm_start_port=9010 -php_fpm_socket_dir=/var/run/php5-fpm +php_fpm_socket_dir=/var/lib/php5-fpm [dns] bind_user=root diff --git a/server/scripts/create_daily_nginx_access_logs.sh b/server/scripts/create_daily_nginx_access_logs.sh index 44d7f6bf95..862c70f8eb 100644 --- a/server/scripts/create_daily_nginx_access_logs.sh +++ b/server/scripts/create_daily_nginx_access_logs.sh @@ -6,4 +6,4 @@ do mv $f/access.log $f/`date "+%Y%m%d"`-access.log &> /dev/null touch $f/access.log &> /dev/null done -/etc/init.d/nginx reload &> /dev/null \ No newline at end of file +pkill -USR1 -u root nginx &> /dev/null \ No newline at end of file -- GitLab