Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
Open sidebar
Zvonimir
ISPConfig 3
Commits
f639109e
Commit
f639109e
authored
Feb 16, 2014
by
Till Brehm
Browse files
added sendmail_path setting to php-fpm and php-fcgi like it is used for mod_php.
parent
6f4f6b80
Changes
4
Hide whitespace changes
Inline
Side-by-side
server/conf/php-fcgi-starter.master
View file @
f639109e
...
...
@@ -13,4 +13,5 @@ exec <tmpl_var name='php_fcgi_bin'> \
<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
server/conf/php_fpm_pool.conf.master
View file @
f639109e
...
...
@@ -32,6 +32,7 @@ chdir = /
<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
View file @
f639109e
...
...
@@ -1167,6 +1167,7 @@ class apache2_plugin {
$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 @@ class apache2_plugin {
$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
View file @
f639109e
...
...
@@ -2344,6 +2344,7 @@ class nginx_plugin {
$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
!=
''
){
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment