added sendmail_path setting to php-fpm and php-fcgi like it is used for mod...

Till Brehm

2014-02-16 f639109e8963cafa5d339c6eb28c66f46516fd78

added sendmail_path setting to php-fpm and php-fcgi like it is used for mod_php.

 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

 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">

 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 != ''){

 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 != ''){