Merge branch 'centos8' into 'stable-3.1'

misc centos 8 fixes

See merge request ispconfig/ispconfig3!996

Author: Till Brehm

install/tpl/fedora_pureftpd_conf.master

@@ -241,13 +241,6 @@ MinUID                      500
 
 
 
-# Do not use the /etc/ftpusers file to disable accounts. We're already
-# using MinUID to block users with uid < 500
-
-UseFtpUsers no
-
-
-
 # Allow FXP transfers for authenticated users.
 
 AllowUserFXP                no

server/lib/classes/cron.d/100-monitor_system_update.inc.php

@@ -159,6 +159,7 @@ public function onRunJob() {
 			 * Fetch the output
 			 */
 			$data['output'] = shell_exec('zypper lu');
+
 		} elseif(file_exists('/etc/redhat-release')) {
                         /*
                          * update and find the upgrade.
@@ -168,13 +169,14 @@ public function onRunJob() {
 			/* try to figure out the default package manager first */
                         if(file_exists('/usr/bin/dnf') && (is_link('/usr/bin/yum'))) {
                                 $rhPkgMgr = 'dnf';
-                        } elseif(file_exists('/usr/bin/dnf') && (!file_exists('/usr/bin/yum')) || (!is_link('/usr/bin/yum'))) {
+                        } elseif(file_exists('/usr/bin/dnf') && (!file_exists('/usr/bin/yum'))) {
                                 $rhPkgMgr = 'dnf';
                         } else {
                                 $rhPkgMgr = 'yum';
                         }
 
-                        $aptData = shell_exec($rhPkgMgr. ' -q list updates');
+			$aptData = shell_exec($rhPkgMgr. ' -q list updates');
+
                         if ($aptData == '') {
                                 /* There is nothing to update! */
                                 $state = 'ok';
@@ -188,7 +190,8 @@ public function onRunJob() {
 
                         /*
                          * Fetch the output
-                         */
+			 */
+
                         $data['output'] = shell_exec($rhPkgMgr. ' -q list updates');
 
 	        } else {

server/plugins-available/nginx_plugin.inc.php

@@ -2728,7 +2728,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 		foreach($rh_releasefiles as $rh_file) {
 			if(file_exists($rh_file) && (filesize($rh_file) > 0)) {
 				$tmp = file_get_contents($rh_file);
-				if(preg_match('/[67]+\.[0-9]+/m', $tmp)) {
+				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']);
 				}