From d33fd2604a98f2ac45fc6129317548fa84c8eaee Mon Sep 17 00:00:00 2001
From: Nedim Hadzimahmutovic <nedim@hadzimahmutovic.com>
Date: Thu, 02 Jan 2014 04:24:03 -0500
Subject: [PATCH] FS#3264 - Put domain name in php-fom pool name
---
server/conf/apps_php_fpm_pool.conf.master | 2 +-
install/tpl/apps_php_fpm_pool.conf.master | 2 +-
server/plugins-available/apache2_plugin.inc.php | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/install/tpl/apps_php_fpm_pool.conf.master b/install/tpl/apps_php_fpm_pool.conf.master
index ce6a92f..e7e065c 100644
--- a/install/tpl/apps_php_fpm_pool.conf.master
+++ b/install/tpl/apps_php_fpm_pool.conf.master
@@ -1,4 +1,4 @@
-[{fpm_pool}]
+[{fpm_pool}-{fpm_domain}]
listen = {fpm_socket}
listen.owner = {fpm_user}
diff --git a/server/conf/apps_php_fpm_pool.conf.master b/server/conf/apps_php_fpm_pool.conf.master
index ce6a92f..e7e065c 100644
--- a/server/conf/apps_php_fpm_pool.conf.master
+++ b/server/conf/apps_php_fpm_pool.conf.master
@@ -1,4 +1,4 @@
-[{fpm_pool}]
+[{fpm_pool}-{fpm_domain}]
listen = {fpm_socket}
listen.owner = {fpm_user}
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index db47d58..526365a 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -2719,6 +2719,7 @@
$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']);
+ $tpl->setVar('fpm_domain', $data['new']['domain']);
$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']);
--
Gitblit v1.9.1