diff --git a/install/tpl/apps_php_fpm_pool.conf.master b/install/tpl/apps_php_fpm_pool.conf.master index ce6a92fcfba48ab25848ab56ce763634fd01544e..e7e065ca79b242e6b20f229f036f3aab4ba65a3d 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 ce6a92fcfba48ab25848ab56ce763634fd01544e..e7e065ca79b242e6b20f229f036f3aab4ba65a3d 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 db47d58af4672ab3c6163408f00d0f84dfd5062e..526365a5de3879ca0aaee8a46f41db08db6549f8 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -2719,6 +2719,7 @@ class apache2_plugin { $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']);