diff --git a/server/conf/apps_php_fpm_pool.conf.master b/server/conf/apps_php_fpm_pool.conf.master index 74597272c0e998f5b1d7412188b9e71e18ed9ee0..b445f47bf1af087af33cc6e696a8ff7f722e8d7a 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_domain}] +[{fpm_pool}] listen = {fpm_socket} listen.owner = {fpm_user} @@ -17,4 +17,4 @@ pm.max_spare_servers = 5 chdir = / ; php_admin_value[open_basedir] = /var/www/apps:/srv/www/apps:/usr/share -php_admin_flag[magic_quotes_gpc] = off \ No newline at end of file +php_admin_flag[magic_quotes_gpc] = off diff --git a/server/plugins-available/apps_vhost_plugin.inc.php b/server/plugins-available/apps_vhost_plugin.inc.php index 4d0866d1de9f283d25e23c857d6b652bf6975e15..ab5db64a806e028d3bde221110f6d220ba81d174 100644 --- a/server/plugins-available/apps_vhost_plugin.inc.php +++ b/server/plugins-available/apps_vhost_plugin.inc.php @@ -215,7 +215,7 @@ class apps_vhost_plugin { $fpm_content = file_get_contents($conf["rootpath"]."/conf/apps_php_fpm_pool.conf.master"); } - $fpm_content = str_replace('{fpm_pool}', 'apps', $fpm_content); + $fpm_content = str_replace('{fpm_pool}', 'ispconfig-apps', $fpm_content); //$fpm_content = str_replace('{fpm_port}', $web_config['php_fpm_start_port']+1, $fpm_content); $fpm_content = str_replace('{fpm_socket}', $fpm_socket, $fpm_content); $fpm_content = str_replace('{fpm_user}', $apps_vhost_user, $fpm_content);