Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1

server/conf/vhost.conf.master

@@ -215,6 +215,7 @@
 <tmpl_if name='cgi' op='==' value='y'>
 		# cgi enabled
 	<Directory {tmpl_var name='document_root'}/cgi-bin>
+			AllowOverride <tmpl_var name='allow_override'>
 			<tmpl_if name='apache_version' op='>' value='2.2' format='version'>
 			Require all granted
 			<tmpl_else>

server/cron.php

@@ -76,7 +76,7 @@ $conf['server_id'] = intval($conf['server_id']);
 
 
 // Load required base-classes
-$app->uses('modules,ini_parser,file,services,getconf,system,cron,functions');
+$app->uses('modules,ini_parser,file,services,getconf,system,cron,functions,plugins');
 $app->load('libdatetime,cronjob');
 
 // read all cron jobs

server/lib/classes/monitor_tools.inc.php

@@ -217,21 +217,18 @@ class monitor_tools {
 			$distconfid = 'debian100';
 			$distid = 'debian60';
 			$distbaseid = 'debian';
-			swriteln("Operating System: Debian 10.0 (Buster) or compatible\n");
 		} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '/sid')) {
 			$distname = 'Debian';
 			$distver = 'Testing';
 			$distid = 'debian60';
 			$distconfid = 'debiantesting';
 			$distbaseid = 'debian';
-			swriteln("Operating System: Debian Testing\n");
 		} else {
 			$distname = 'Debian';
 			$distver = 'Unknown';
 			$distid = 'debian60';
 			$distconfid = 'debian100';
 			$distbaseid = 'debian';
-			swriteln("Operating System: Debian or compatible, unknown version.\n");
 		}
 	}