Skip to content

Commit f639109

Browse files
author
Till Brehm
committed
added sendmail_path setting to php-fpm and php-fcgi like it is used for mod_php.
1 parent 6f4f6b8 commit f639109

File tree

4 files changed

+5
-0
lines changed

4 files changed

+5
-0
lines changed

server/conf/php-fcgi-starter.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ exec <tmpl_var name='php_fcgi_bin'> \
1313
<tmpl_if name="security_level" op="==" value="20"> -d open_basedir="<tmpl_var name='open_basedir'>" \
1414
-d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \
1515
-d session.save_path=<tmpl_var name='document_root'>/tmp \
16+
-d sendmail_path="/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>" \
1617
</tmpl_if> $1

server/conf/php_fpm_pool.conf.master

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ chdir = /
3232
<tmpl_var name='enable_php_open_basedir'>php_admin_value[open_basedir] = <tmpl_var name='php_open_basedir'>
3333
php_admin_value[session.save_path] = <tmpl_var name='document_root'>/tmp
3434
php_admin_value[upload_tmp_dir] = <tmpl_var name='document_root'>/tmp
35+
php_admin_value[sendmail_path] = "/usr/sbin/sendmail -t -i -fwebmaster@<tmpl_var name='domain'>"
3536
</tmpl_if>
3637

3738
<tmpl_loop name="custom_php_ini_settings">

server/plugins-available/apache2_plugin.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,6 +1167,7 @@ function update($event_name, $data) {
11671167
$fcgi_tpl->setVar('php_fcgi_bin', escapeshellcmd($custom_fastcgi_php_executable));
11681168
}
11691169
$fcgi_tpl->setVar('security_level', intval($web_config['security_level']));
1170+
$fcgi_tpl->setVar('domain', escapeshellcmd($data['new']['domain']));
11701171

11711172
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];
11721173
$fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));
@@ -2644,6 +2645,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
26442645
$tpl->setVar('pm_max_requests', $data['new']['pm_max_requests']);
26452646
$tpl->setVar('document_root', $data['new']['document_root']);
26462647
$tpl->setVar('security_level', $web_config['security_level']);
2648+
$tpl->setVar('domain', $data['new']['domain']);
26472649
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?escapeshellcmd($data['new']['document_root']):escapeshellcmd($data['new']['php_open_basedir']);
26482650
$tpl->setVar('php_open_basedir', $php_open_basedir);
26492651
if($php_open_basedir != ''){

server/plugins-available/nginx_plugin.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2344,6 +2344,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
23442344
$tpl->setVar('pm_max_requests', $data['new']['pm_max_requests']);
23452345
$tpl->setVar('document_root', $data['new']['document_root']);
23462346
$tpl->setVar('security_level', $web_config['security_level']);
2347+
$tpl->setVar('domain', $data['new']['domain']);
23472348
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?escapeshellcmd($data['new']['document_root']):escapeshellcmd($data['new']['php_open_basedir']);
23482349
$tpl->setVar('php_open_basedir', $php_open_basedir);
23492350
if($php_open_basedir != ''){

0 commit comments

Comments
 (0)