diff --git a/server/conf/php-fcgi-starter.master b/server/conf/php-fcgi-starter.master index 453951c15b8a740c7a1e08a89b2e2f05e23194fa..c3676baebc0bbef8879887b1c1a8b467a7fb57b9 100644 --- a/server/conf/php-fcgi-starter.master +++ b/server/conf/php-fcgi-starter.master @@ -8,7 +8,7 @@ export PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS=<tmpl_var name='php_fcgi_max_requests'> export PHP_FCGI_MAX_REQUESTS exec <tmpl_var name='php_fcgi_bin'> \ --d open_basedir=<tmpl_var name='document_root'> \ +<tmpl_if name="security_level" op="==" value="20"> -d open_basedir=<tmpl_var name='document_root'> \ -d upload_tmp_dir=<tmpl_var name='document_root'>/tmp \ -d session.save_path=<tmpl_var name='document_root'>/tmp \ -$1 \ No newline at end of file +</tmpl_if> $1 \ No newline at end of file diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 70df9f0cdac8b9e3e8e909836a8b17544d589784..9e1c94855f258c43d690795e67a5dd148c845cbe 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -650,6 +650,7 @@ class apache2_plugin { $fcgi_tpl->setVar('php_fcgi_children',$fastcgi_config["fastcgi_children"]); $fcgi_tpl->setVar('php_fcgi_max_requests',$fastcgi_config["fastcgi_max_requests"]); $fcgi_tpl->setVar('php_fcgi_bin',$fastcgi_config["fastcgi_bin"]); + $fcgi_tpl->setVar('security_level',$web_config["security_level"]); $fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config["fastcgi_starter_script"]); file_put_contents($fcgi_starter_script,$fcgi_tpl->grab()); @@ -701,6 +702,7 @@ class apache2_plugin { // This will NOT work! //$cgi_tpl->setVar('open_basedir', "/var/www/" . $data["new"]["domain"]); $cgi_tpl->setVar('php_cgi_bin',$cgi_config["cgi_bin"]); + $cgi_tpl->setVar('security_level',$web_config["security_level"]); $cgi_starter_script = escapeshellcmd($cgi_starter_path.$cgi_config["cgi_starter_script"]); file_put_contents($cgi_starter_script,$cgi_tpl->grab());