Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Philipp
ISPConfig 3
Commits
0b3abd89
Commit
0b3abd89
authored
Nov 09, 2017
by
Till Brehm
Browse files
Fixed #4828 Wrong group owner of FPM Socket on Centos with NGINX
parent
aad778ef
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/plugins-available/nginx_plugin.inc.php
View file @
0b3abd89
...
...
@@ -2589,6 +2589,8 @@ class nginx_plugin {
private
function
php_fpm_pool_update
(
$data
,
$web_config
,
$pool_dir
,
$pool_name
,
$socket_dir
)
{
global
$app
,
$conf
;
$pool_dir
=
trim
(
$pool_dir
);
$rh_releasefiles
=
array
(
'/etc/centos-release'
,
'/etc/redhat-release'
);
// HHVM => PHP-FPM-Fallback
if
(
$data
[
'new'
][
'php'
]
==
'php-fpm'
||
$data
[
'new'
][
'php'
]
==
'hhvm'
){
if
(
trim
(
$data
[
'new'
][
'fastcgi_php_version'
])
!=
''
){
...
...
@@ -2649,7 +2651,25 @@ class nginx_plugin {
$tpl
->
setVar
(
'fpm_pool'
,
$pool_name
);
$tpl
->
setVar
(
'fpm_port'
,
$web_config
[
'php_fpm_start_port'
]
+
$data
[
'new'
][
'domain_id'
]
-
1
);
$tpl
->
setVar
(
'fpm_user'
,
$data
[
'new'
][
'system_user'
]);
$tpl
->
setVar
(
'fpm_group'
,
$data
[
'new'
][
'system_group'
]);
//Red Hat workaround for group ownership of socket files
foreach
(
$rh_releasefiles
as
$rh_file
)
{
if
(
file_exists
(
$rh_file
)
&&
(
filesize
(
$rh_file
)
>
0
))
{
$tmp
=
file_get_contents
(
$rh_file
);
if
(
preg_match
(
'/[67]+\.[0-9]+/m'
,
$tmp
))
{
$tpl
->
setVar
(
'fpm_group'
,
$data
[
'new'
][
'system_group'
]);
$tpl
->
setVar
(
'fpm_listen_group'
,
$data
[
'new'
][
'system_group'
]);
}
unset
(
$tmp
);
}
elseif
(
!
file_exists
(
$rh_file
))
{
//OS seems to be not Red Hat'ish
$tpl
->
setVar
(
'fpm_group'
,
$web_config
[
'group'
]);
$tpl
->
setVar
(
'fpm_listen_group'
,
$web_config
[
'group'
]);
}
break
;
}
// $tpl->setVar('fpm_group', $web_config['group']);
$tpl
->
setVar
(
'fpm_listen_user'
,
$data
[
'new'
][
'system_user'
]);
$tpl
->
setVar
(
'fpm_listen_group'
,
$web_config
[
'group'
]);
$tpl
->
setVar
(
'fpm_domain'
,
$data
[
'new'
][
'domain'
]);
...
...
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