Merge branch 'master' of /home/git/repositories/grungy/ispconfig3

Author: Marius Cramer

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}

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}

server/plugins-available/apache2_plugin.inc.php

@@ -2719,6 +2719,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $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', $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']);