Merge branch 'stable-3.1' into 'stable-3.1'

Restore fpm_group owner-ship

See merge request ispconfig/ispconfig3!675

Author: Till Brehm

server/plugins-available/nginx_plugin.inc.php

@@ -2663,15 +2663,13 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 				unset($tmp);
 			} elseif(!file_exists($rh_file)) {
 				//OS seems to be not Red Hat'ish
-				$tpl->setVar('fpm_group', $web_config['group']);
+				$tpl->setVar('fpm_group', $data['new']['system_group']);
 				$tpl->setVar('fpm_listen_group', $web_config['group']);
 			}
 			break;
 		}
 
-		// $tpl->setVar('fpm_group', $web_config['group']);
 		$tpl->setVar('fpm_listen_user', $data['new']['system_user']);
-		$tpl->setVar('fpm_listen_group', $web_config['group']);
 		$tpl->setVar('fpm_domain', $data['new']['domain']);
 		$tpl->setVar('pm', $data['new']['pm']);
 		$tpl->setVar('pm_max_children', $data['new']['pm_max_children']);