From 31d46a24d36490048abb18cccb4ad232095b23cf Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Wed, 19 Oct 2016 18:00:49 +0200
Subject: [PATCH] Splitted PHP-FPM user in website and listen user and group.
Related to #4281
---
server/conf/php_fpm_pool.conf.master | 4 ++--
server/plugins-available/apache2_plugin.inc.php | 4 +++-
server/plugins-available/nginx_plugin.inc.php | 4 +++-
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/conf/php_fpm_pool.conf.master b/server/conf/php_fpm_pool.conf.master
index c0884acfe4..fd7e996a76 100644
--- a/server/conf/php_fpm_pool.conf.master
+++ b/server/conf/php_fpm_pool.conf.master
@@ -6,8 +6,8 @@ listen.allowed_clients = 127.0.0.1
</tmpl_if>
<tmpl_if name='use_socket'>
listen = <tmpl_var name='fpm_socket'>
-listen.owner = <tmpl_var name='fpm_user'>
-listen.group = <tmpl_var name='fpm_group'>
+listen.owner = <tmpl_var name='fpm_listen_user'>
+listen.group = <tmpl_var name='fpm_listen_group'>
listen.mode = <tmpl_var name='fpm_listen_mode'>
</tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index c5f7f24132..f389b907ad 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -3170,7 +3170,9 @@ class apache2_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', $web_config['group']);
+ $tpl->setVar('fpm_group', $data['new']['system_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']);
$tpl->setVar('pm', $data['new']['pm']);
$tpl->setVar('pm_max_children', $data['new']['pm_max_children']);
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 866950d4a5..7c3e49e755 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -2785,7 +2785,9 @@ 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', $web_config['group']);
+ $tpl->setVar('fpm_group', $data['new']['system_group']);
+ $tpl->setVar('fpm_listen_user', $data['new']['system_user']);
+ $tpl->setVar('fpm_listen_group', $web_config['group']);
$tpl->setVar('pm', $data['new']['pm']);
$tpl->setVar('pm_max_children', $data['new']['pm_max_children']);
$tpl->setVar('pm_start_servers', $data['new']['pm_start_servers']);
--
GitLab