From f639109e8963cafa5d339c6eb28c66f46516fd78 Mon Sep 17 00:00:00 2001 From: Till Brehm <tbrehm@ispconfig.org> Date: Sun, 16 Feb 2014 03:35:53 -0500 Subject: [PATCH] added sendmail_path setting to php-fpm and php-fcgi like it is used for mod_php. --- server/plugins-available/apache2_plugin.inc.php | 2 ++ server/conf/php-fcgi-starter.master | 1 + server/plugins-available/nginx_plugin.inc.php | 1 + server/conf/php_fpm_pool.conf.master | 1 + 4 files changed, 5 insertions(+), 0 deletions(-) diff --git a/server/conf/php-fcgi-starter.master b/server/conf/php-fcgi-starter.master index 97a1628..ea02581 100644 --- a/server/conf/php-fcgi-starter.master +++ b/server/conf/php-fcgi-starter.master @@ -13,4 +13,5 @@ <tmpl_if name="security_level" op="==" value="20"> -d open_basedir="<tmpl_var name='open_basedir'>" \ -d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \ -d session.save_path=<tmpl_var name='document_root'>/tmp \ +-d sendmail_path="/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>" \ </tmpl_if> $1 \ 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 b8fce17..37edbb7 100644 --- a/server/conf/php_fpm_pool.conf.master +++ b/server/conf/php_fpm_pool.conf.master @@ -32,6 +32,7 @@ <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 +php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>" </tmpl_if> <tmpl_loop name="custom_php_ini_settings"> diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index aec93b9..3c83dc1 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -1167,6 +1167,7 @@ $fcgi_tpl->setVar('php_fcgi_bin', escapeshellcmd($custom_fastcgi_php_executable)); } $fcgi_tpl->setVar('security_level', intval($web_config['security_level'])); + $fcgi_tpl->setVar('domain', escapeshellcmd($data['new']['domain'])); $php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir']; $fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir)); @@ -2644,6 +2645,7 @@ $tpl->setVar('pm_max_requests', $data['new']['pm_max_requests']); $tpl->setVar('document_root', $data['new']['document_root']); $tpl->setVar('security_level', $web_config['security_level']); + $tpl->setVar('domain', $data['new']['domain']); $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); if($php_open_basedir != ''){ diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php index b563387..d66521b 100644 --- a/server/plugins-available/nginx_plugin.inc.php +++ b/server/plugins-available/nginx_plugin.inc.php @@ -2344,6 +2344,7 @@ $tpl->setVar('pm_max_requests', $data['new']['pm_max_requests']); $tpl->setVar('document_root', $data['new']['document_root']); $tpl->setVar('security_level', $web_config['security_level']); + $tpl->setVar('domain', $data['new']['domain']); $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); if($php_open_basedir != ''){ -- Gitblit v1.9.1