Merge branch '6485-nginx-php-fpm-workaround' into 'develop'

simplify redhat os detection for the Nginx EL workaround

Closes #6485

See merge request ispconfig/ispconfig3!1708

Author: Till Brehm

server/lib/classes/system.inc.php

@@ -2347,6 +2347,16 @@ public function is_allowed_group($groupname, $check_id = true, $restrict_names =
 		return true;
 	}
 
+	public function is_redhat_os() {
+		global $app;
+
+		if(file_exists('/etc/redhat-release') && (filesize('/etc/redhat-release') > 0)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	public function is_allowed_path($path) {
 		global $app;
 

server/plugins-available/nginx_plugin.inc.php

@@ -2852,7 +2852,6 @@ private function hhvm_update($data, $web_config) {
 	private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name, $socket_dir, $web_folder = null) {
 		global $app, $conf;
 		$pool_dir = trim($pool_dir);
-		$rh_releasefiles = array('/etc/centos-release', '/etc/redhat-release');
 
 		// HHVM => PHP-FPM-Fallback
 		$default_php_fpm = true;
@@ -2923,21 +2922,14 @@ 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']);
 
-		//Red Hat workaround for group ownership of socket files
-		foreach($rh_releasefiles as $rh_file) {
-			if(file_exists($rh_file) && (filesize($rh_file) > 0)) {
-				$tmp = file_get_contents($rh_file);
-				if(preg_match('/[678]+\.[0-9]+/m', $tmp)) {
-					$tpl->setVar('fpm_group', $data['new']['system_group']);
-					$tpl->setVar('fpm_listen_group', $data['new']['system_group']);
-				}
-				unset($tmp);
-			} elseif(!file_exists($rh_file)) {
-				//OS seems to be not Red Hat'ish
-				$tpl->setVar('fpm_group', $data['new']['system_group']);
-				$tpl->setVar('fpm_listen_group', $web_config['group']);
-			}
-			break;
+		// RH workaround here
+		if($app->system->is_redhat_os() == true) {
+			$tpl->setVar('fpm_group', $data['new']['system_group']);
+			$tpl->setVar('fpm_listen_group', $data['new']['system_group']);
+		} else {
+			//OS seems to be not Red Hat'ish
+			$tpl->setVar('fpm_group', $data['new']['system_group']);
+			$tpl->setVar('fpm_listen_group', $web_config['group']);
 		}
 
 		$tpl->setVar('fpm_listen_user', $data['new']['system_user']);