From af99f3ef9682e9a5e75d9b67698ee6e57436c6b9 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Tue, 6 Aug 2019 13:45:09 +0200
Subject: [PATCH] Fixes #5362 wrong pool dir used for php-fpm
---
server/plugins-available/apache2_plugin.inc.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index ad8de1ab4c..59e97629cb 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1559,9 +1559,11 @@ class apache2_plugin {
if($default_php_fpm){
$pool_dir = $web_config['php_fpm_pool_dir'];
+ } else {
$pool_dir = $custom_php_fpm_pool_dir;
}
$pool_dir = trim($pool_dir);
+
if(substr($pool_dir, -1) != '/') $pool_dir .= '/';
$pool_name = 'web'.$data['new']['domain_id'];
$socket_dir = $web_config['php_fpm_socket_dir'];
--
GitLab