From c1e083c8b25fb69164f595456cb12e9292e00bbc Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Tue, 4 Oct 2011 19:03:45 +0200 Subject: [PATCH] Tagging 0.9.24 Signed-off-by: Florian Aders (EleRas) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 9 ++++++++- lib/tables.inc.php | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 7394f108..557756d1 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -468,7 +468,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.24-rc1'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.24'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index c64585b5..96114dd4 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1693,7 +1693,6 @@ if(isFroxlorVersion('0.9.23')) updateToVersion('0.9.24-svn1'); } - if(isFroxlorVersion('0.9.24-svn1')) { showUpdateStep("Updating from 0.9.24-svn1 to 0.9.24-rc1"); @@ -1702,3 +1701,11 @@ if(isFroxlorVersion('0.9.24-svn1')) updateToVersion('0.9.24-rc1'); } +if(isFroxlorVersion('0.9.24-rc1')) +{ + showUpdateStep("Updating from 0.9.24-rc1 to 0.9.24"); + lastStepStatus(0); + + updateToVersion('0.9.24'); +} + diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 0eada10a..d1a63c15 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.24-rc1'; +$version = '0.9.24'; $dbversion = '2'; $branding = '';