- Adjusted default installer settings for nginx for CentOS, Fedora, OpenSUSE.

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

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

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

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

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