diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 0b6aab80607732793fa1d9e39464816026a37ff6..22318df5d44ba50e82ea67036ac39f517a5bd51f 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -861,6 +861,9 @@ class installer_dist extends installer_base { if($conf['nginx']['installed'] == true){ $command = 'usermod -a -G ispconfig '.$conf['nginx']['user']; caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); + // Allow the ISPConfig vhost access to /etc/squirrelmail + $command = 'usermod -a -G '.$conf['apache']['group'].' ispconfig'; + caselog($command.' &> /dev/null', __FILE__, __LINE__, "EXECUTED: $command", "Failed to execute the command $command"); } //* Make the shell scripts executable diff --git a/install/tpl/php_fpm_pool.conf.master b/install/tpl/php_fpm_pool.conf.master index 1b27bb9938606d903049081d4cb4cb3a2671115e..5a2c6c8d925c62cf395fb12b189854aab1b2e512 100644 --- a/install/tpl/php_fpm_pool.conf.master +++ b/install/tpl/php_fpm_pool.conf.master @@ -13,4 +13,7 @@ pm.start_servers = 20 pm.min_spare_servers = 5 pm.max_spare_servers = 35 -chdir = / \ No newline at end of file +chdir = / + +php_admin_value[session.save_path] = /usr/local/ispconfig/server/temp +php_admin_flag[magic_quotes_gpc] = off \ No newline at end of file diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master index 0bde26bcd8bef70d60a5242bcc852636ae09b77e..0e741734f1920b2cbadb8b545efb15a3694e1343 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -24,6 +24,8 @@ chdir = / <tmpl_if name='security_level' op='==' value='20'> <tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'> +php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp +php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp </tmpl_if> <tmpl_loop name="custom_php_ini_settings"> diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index 07c0332d41443b703902bf6a825b4da03bed2433..4c9c2abfae0538953ac82f44900dcac12585a2d9 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -1132,6 +1132,7 @@ class nginx_plugin { $tpl->setVar('fpm_port', $web_config['php_fpm_start_port'] + $data['new']['domain_id'] + 1); $tpl->setVar('fpm_user', $data['new']['system_user']); $tpl->setVar('fpm_group', $data['new']['system_group']); + $tpl->setVar('document_root', $data['new']['document_root']); $tpl->setVar('security_level',$web_config['security_level']); $php_open_basedir = ($data['new']['php_open_basedir'] == '')?escapeshellcmd($data['new']['document_root']):escapeshellcmd($data['new']['php_open_basedir']); $tpl->setVar('php_open_basedir', $php_open_basedir);