Fixed: FS#3302 - Hourly monitoring of system updates make system unusable

- Updated Linux Distribution detection to recognize all wheezy sub versions correctly.

Author: Till Brehm

install/lib/install.lib.php

@@ -160,7 +160,7 @@ function get_distname() {
 			$distid = 'debian60';
 			$distbaseid = 'debian';
 			swriteln("Operating System: Debian 6.0 (Squeeze/Sid) or compatible\n");
-		} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || strstr(trim(file_get_contents('/etc/debian_version')), '7.1') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
+		} elseif(strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || substr(trim(file_get_contents('/etc/debian_version')),0,2) == '7.' || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
 			$distname = 'Debian';
 			$distver = 'Wheezy/Sid';
 			$distid = 'debian60';

install/tpl/server.ini.master

@@ -24,6 +24,7 @@ monit_password=
 munin_url=
 munin_user=
 munin_password=
+monitor_system_updates=y
 
 [mail]
 module=postfix_mysql

interface/web/admin/form/server_config.tform.php

@@ -249,6 +249,12 @@
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'monitor_system_updates' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'CHECKBOX',
+			'default' => 'y',
+			'value' => array(0 => 'n', 1 => 'y')
+		),
 		//#################################
 		// ENDE Datatable fields
 		//#################################

interface/web/admin/lib/lang/de_server_config.lng

@@ -190,4 +190,5 @@ $wb['munin_url_error_regex'] = 'Ungültige Munin-URL';
 $wb['munin_url_note_txt'] = 'Platzhalter:';
 $wb['backup_dir_is_mount_txt'] = 'Backupverzeichnis ist ein eigener Mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount-Befehl, falls Backupverzeichnis nicht gemountet';
+$wb['monitor_system_updates_txt'] = 'Suche nach Linux updates';
 ?>

interface/web/admin/lib/lang/en_server_config.lng

@@ -190,4 +190,5 @@ $wb['munin_url_error_regex'] = 'Invalid Munin URL';
 $wb['munin_url_note_txt'] = 'Placeholder:';
 $wb['backup_dir_is_mount_txt'] = 'Backup directory is a mount?';
 $wb['backup_dir_mount_cmd_txt'] = 'Mount command, if backup directory not mounted';
+$wb['monitor_system_updates_txt'] = 'Check for Linux updates';
 ?>

interface/web/admin/templates/server_config_server_edit.htm

@@ -98,6 +98,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
 			<div class="ctrlHolder">
                 <label for="munin_password">{tmpl_var name='munin_password_txt'}</label>
                 <input name="munin_password" id="munin_password" value="{tmpl_var name='munin_password'}" size="40" maxlength="255" type="text" class="textInput" />
+            </div>
+			<div class="ctrlHolder">
+                <p class="label">{tmpl_var name='monitor_system_updates_txt'}</p>
+                <div class="multiField">
+                    {tmpl_var name='monitor_system_updates'}
+                </div>
             </div>
         </fieldset>
 

server/lib/classes/monitor_tools.inc.php

@@ -132,7 +132,7 @@ public function get_distname() {
 				$distver = 'Squeeze/Sid';
 				$distid = 'debian60';
 				$distbaseid = 'debian';
-			} elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || strstr(trim(file_get_contents('/etc/debian_version')), '7.1') || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
+			} elseif (strstr(trim(file_get_contents('/etc/debian_version')), '7.0') || substr(trim(file_get_contents('/etc/debian_version')),0,2) == '7.' || trim(file_get_contents('/etc/debian_version')) == 'wheezy/sid') {
 				$distname = 'Debian';
 				$distver = 'Wheezy/Sid';
 				$distid = 'debian60';

server/mods-available/monitor_core_module.inc.php

@@ -419,6 +419,10 @@ private function _monitorSystemUpdate() {
 		 * OK - here we go...
 		 */
 		global $app;
+		
+		$app->uses('getconf');
+		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
+		if($server_config['monitor_system_updates'] == 'n') return;
 
 		/*
 		 * First we get the Monitoring-data from the tools