From a59c2139064be5cf0dd6c987edd7217cbd0d4acd Mon Sep 17 00:00:00 2001 From: ftimme Date: Tue, 20 Sep 2011 14:39:36 +0000 Subject: [PATCH] - Adjusted default installer settings for nginx for CentOS, Fedora, OpenSUSE. --- install/dist/conf/centos52.conf.php | 6 +++--- install/dist/conf/centos53.conf.php | 6 +++--- install/dist/conf/fedora9.conf.php | 6 +++--- install/dist/conf/opensuse110.conf.php | 8 ++++---- install/dist/conf/opensuse112.conf.php | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 3b95c7b48e..d32f69b173 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -188,9 +188,9 @@ $conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled'; $conf['nginx']['init_script'] = 'nginx'; $conf['nginx']['vhost_port'] = '8080'; $conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket'; -$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_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; //* vlogger diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index 3b95c7b48e..d32f69b173 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -188,9 +188,9 @@ $conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled'; $conf['nginx']['init_script'] = 'nginx'; $conf['nginx']['vhost_port'] = '8080'; $conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket'; -$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_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; //* vlogger diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 86f6ecbdbb..3e1bda1147 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -188,9 +188,9 @@ $conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled'; $conf['nginx']['init_script'] = 'nginx'; $conf['nginx']['vhost_port'] = '8080'; $conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket'; -$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_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; //* vlogger diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index 9e16773fec..6cb0a788d3 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -180,17 +180,17 @@ $conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl / //* Nginx $conf['nginx']['installed'] = false; // will be detected automatically during installation -$conf['nginx']['user'] = 'wwwrun'; -$conf['nginx']['group'] = 'www'; +$conf['nginx']['user'] = 'nginx'; +$conf['nginx']['group'] = 'nginx'; $conf['nginx']['config_dir'] = '/etc/nginx'; $conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available'; $conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled'; $conf['nginx']['init_script'] = 'nginx'; $conf['nginx']['vhost_port'] = '8080'; $conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket'; -$conf['nginx']['php_fpm_init_script'] = 'php5-fpm'; +$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/pool.d'; +$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm'; $conf['nginx']['php_fpm_start_port'] = 9010; //* vlogger diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index ac95961bbd..fe114f02a3 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -180,17 +180,17 @@ $conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl / //* Nginx $conf['nginx']['installed'] = false; // will be detected automatically during installation -$conf['nginx']['user'] = 'wwwrun'; -$conf['nginx']['group'] = 'www'; +$conf['nginx']['user'] = 'nginx'; +$conf['nginx']['group'] = 'nginx'; $conf['nginx']['config_dir'] = '/etc/nginx'; $conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available'; $conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled'; $conf['nginx']['init_script'] = 'nginx'; $conf['nginx']['vhost_port'] = '8080'; $conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket'; -$conf['nginx']['php_fpm_init_script'] = 'php5-fpm'; +$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/pool.d'; +$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm'; $conf['nginx']['php_fpm_start_port'] = 9010; //* vlogger -- GitLab