diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 3b95c7b48edf785f1466d2c41e5d8de54e522c76..d32f69b173b6950efe6543241f26edf16e6fb5ea 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 3b95c7b48edf785f1466d2c41e5d8de54e522c76..d32f69b173b6950efe6543241f26edf16e6fb5ea 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 86f6ecbdbbd0d4e7e0745ab0c4221e66372f7278..3e1bda1147c47d4cf2f1e5a38fced48934e224cd 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 9e16773fecbface7c8db42e1cd7965da51a8d48e..6cb0a788d357fdfa256fc70e007076611fc1f5a5 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 ac95961bbd8c84620335931a5b474f4b5f3ea785..fe114f02a384c058fc608f426e2ef03b23654dd4 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