Skip to content

Commit a59c213

Browse files
committed
- Adjusted default installer settings for nginx for CentOS, Fedora, OpenSUSE.
1 parent 3c12a49 commit a59c213

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

install/dist/conf/centos52.conf.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@
188188
$conf['nginx']['init_script'] = 'nginx';
189189
$conf['nginx']['vhost_port'] = '8080';
190190
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191-
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192-
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193-
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
191+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
194194
$conf['nginx']['php_fpm_start_port'] = 9010;
195195

196196
//* vlogger

install/dist/conf/centos53.conf.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@
188188
$conf['nginx']['init_script'] = 'nginx';
189189
$conf['nginx']['vhost_port'] = '8080';
190190
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191-
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192-
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193-
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
191+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
194194
$conf['nginx']['php_fpm_start_port'] = 9010;
195195

196196
//* vlogger

install/dist/conf/fedora9.conf.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@
188188
$conf['nginx']['init_script'] = 'nginx';
189189
$conf['nginx']['vhost_port'] = '8080';
190190
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191-
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
192-
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193-
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
191+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
192+
$conf['nginx']['php_fpm_ini_path'] = '/etc/php.ini';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php-fpm.d';
194194
$conf['nginx']['php_fpm_start_port'] = 9010;
195195

196196
//* vlogger

install/dist/conf/opensuse110.conf.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@
180180

181181
//* Nginx
182182
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183-
$conf['nginx']['user'] = 'wwwrun';
184-
$conf['nginx']['group'] = 'www';
183+
$conf['nginx']['user'] = 'nginx';
184+
$conf['nginx']['group'] = 'nginx';
185185
$conf['nginx']['config_dir'] = '/etc/nginx';
186186
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187187
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188188
$conf['nginx']['init_script'] = 'nginx';
189189
$conf['nginx']['vhost_port'] = '8080';
190190
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191-
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
191+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
192192
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193-
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm';
194194
$conf['nginx']['php_fpm_start_port'] = 9010;
195195

196196
//* vlogger

install/dist/conf/opensuse112.conf.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,17 +180,17 @@
180180

181181
//* Nginx
182182
$conf['nginx']['installed'] = false; // will be detected automatically during installation
183-
$conf['nginx']['user'] = 'wwwrun';
184-
$conf['nginx']['group'] = 'www';
183+
$conf['nginx']['user'] = 'nginx';
184+
$conf['nginx']['group'] = 'nginx';
185185
$conf['nginx']['config_dir'] = '/etc/nginx';
186186
$conf['nginx']['vhost_conf_dir'] = '/etc/nginx/sites-available';
187187
$conf['nginx']['vhost_conf_enabled_dir'] = '/etc/nginx/sites-enabled';
188188
$conf['nginx']['init_script'] = 'nginx';
189189
$conf['nginx']['vhost_port'] = '8080';
190190
$conf['nginx']['cgi_socket'] = '/var/run/fcgiwrap.socket';
191-
$conf['nginx']['php_fpm_init_script'] = 'php5-fpm';
191+
$conf['nginx']['php_fpm_init_script'] = 'php-fpm';
192192
$conf['nginx']['php_fpm_ini_path'] = '/etc/php5/fpm/php.ini';
193-
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm/pool.d';
193+
$conf['nginx']['php_fpm_pool_dir'] = '/etc/php5/fpm';
194194
$conf['nginx']['php_fpm_start_port'] = 9010;
195195

196196
//* vlogger

0 commit comments

Comments
 (0)