Commit bcb8eb94 authored by Falko Timme's avatar Falko Timme
Browse files

- Installer adds ispconfig user to Apache group on Fedora/CentOS so that...

- Installer adds ispconfig user to Apache group on Fedora/CentOS so that nginx/PHP-FPM can access /etc/squirrelmail and serve SquirrelMail for the ISPConfig vhost.
- Added session.save_path and upload_tmp_dir settings to the PHP-FPM pool definitions.
parent cd5645e4
......@@ -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
......
......@@ -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
......@@ -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">
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment