Skip to content

Commit

Permalink
Version increases to 4.3.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-unwin committed Jan 26, 2022
1 parent 35f821d commit 8761e04
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 4 deletions.
4 changes: 2 additions & 2 deletions code_igniter/application/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
if ( ! defined('BASEPATH')) {
exit('No direct script access allowed');
}
$config['web_internal_version'] = '20211213';
$config['web_display_version'] = '4.3.1';
$config['web_internal_version'] = '20220126';
$config['web_display_version'] = '4.3.2';
$config['microtime'] = microtime(true);
// $config['debug'] = false;
/*
Expand Down
5 changes: 5 additions & 0 deletions code_igniter/application/controllers/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,11 @@ public function update()
include "db_upgrades/db_4.3.1.php";
}

if (($db_internal_version < '20220126') and ($this->db->platform() == 'mysql' or $this->db->platform() == 'mysqli')) {
# upgrade for 4.3.2
include "db_upgrades/db_4.3.2.php";
}

$this->data['include'] = 'v_database_update';
$this->data['heading'] = 'Database Upgrade';
$this->data['success'] = "Database upgraded successfully. New database version is ".$this->config->config['display_version']." (".$this->config->config['internal_version'].")";
Expand Down
50 changes: 50 additions & 0 deletions code_igniter/application/controllers/db_upgrades/db_4.3.2.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?php
/**
# Copyright 2003-2015 Opmantek Limited (www.opmantek.com)
#
# ALL CODE MODIFICATIONS MUST BE SENT TO [email protected]
#
# This file is part of Open-AudIT.
#
# Open-AudIT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published
# by the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Open-AudIT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with Open-AudIT (most likely in a file named LICENSE).
# If not, see <http://www.gnu.org/licenses/>
#
# For further information on Open-AudIT or for a license other than AGPL please see
# www.opmantek.com or email [email protected]
#
# *****************************************************************************
*
**/

/*
UPDATE `configuration` SET `value` = '20220126' WHERE `name` = 'internal_version';
UPDATE `configuration` SET `value` = '4.3.2' WHERE `name` = 'display_version';
*/

$this->log_db('Upgrade database to 4.3.2 commenced');

// set our versions
$sql = "UPDATE `configuration` SET `value` = '20220126' WHERE `name` = 'internal_version'";
$this->db->query($sql);
$this->log_db($this->db->last_query() . ';');

$sql = "UPDATE `configuration` SET `value` = '4.3.2' WHERE `name` = 'display_version'";
$this->db->query($sql);
$this->log_db($this->db->last_query() . ';');

$this->log_db('Upgrade database to 4.3.2 completed');
$this->config->config['internal_version'] = '20220126';
$this->config->config['display_version'] = '4.3.2';
4 changes: 2 additions & 2 deletions other/openaudit_mysql.sql
Original file line number Diff line number Diff line change
Expand Up @@ -941,12 +941,12 @@ INSERT INTO `configuration` VALUES (NULL,'discovery_sunos_use_sudo','y','bool','
INSERT INTO `configuration` VALUES (NULL,'discovery_use_dns','y','bool','y','system','2000-01-01 00:00:00','Should we use DNS for looking up the hostname and domain.');
INSERT INTO `configuration` VALUES (NULL,'discovery_use_ipmi','y','bool','y','system','2000-01-01 00:00:00','Should we use ipmitool for discovering management ports if ipmitool is installed.');
INSERT INTO `configuration` VALUES (NULL,'discovery_use_vintage_service','n','bool','y','system','2000-01-01 00:00:00','On Windows, use the old way of running discovery with the Apache service account.');
INSERT INTO `configuration` VALUES (NULL,'display_version','4.3.1','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.');
INSERT INTO `configuration` VALUES (NULL,'display_version','4.3.2','text','n','system','2000-01-01 00:00:00','The version shown on the web pages.');
INSERT INTO `configuration` VALUES (NULL,'download_reports','y','bool','y','system','2000-01-01 00:00:00','Tells Open-AudIT to advise the browser to download as a file or display the csv, xml, json reports.');
INSERT INTO `configuration` VALUES (NULL,'graph_days','30','number','y','system','2000-01-01 00:00:00','The number of days to report on for the Enterprise graphs.');
INSERT INTO `configuration` VALUES (NULL,'gui_trim_characters','25','number','y','system','2000-01-01 00:00:00','When showing a table of information in the web GUI, replace characters greater than this with \"...\".');
INSERT INTO `configuration` VALUES (NULL,'homepage','summaries','text','y','system','2000-01-01 00:00:00','Any links to the default page should be directed to this endpoint.');
INSERT INTO `configuration` VALUES (NULL,'internal_version','20211213','number','n','system','2000-01-01 00:00:00','The internal numerical version.');
INSERT INTO `configuration` VALUES (NULL,'internal_version','20220126','number','n','system','2000-01-01 00:00:00','The internal numerical version.');
INSERT INTO `configuration` VALUES (NULL,'log_level','5','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT which severity of event (at least) should be logged.');
INSERT INTO `configuration` VALUES (NULL,'log_retain_level_0','180','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 0.');
INSERT INTO `configuration` VALUES (NULL,'log_retain_level_1','180','number','y','system','2000-01-01 00:00:00','Tells Open-AudIT how many days to keep logs with severity 1.');
Expand Down

0 comments on commit 8761e04

Please sign in to comment.