From 6e4121d9bbf7d3aae2fa00c7c8be69205d288c95 Mon Sep 17 00:00:00 2001 From: "Florian Aders (EleRas)" Date: Mon, 14 Nov 2011 15:47:27 +0100 Subject: [PATCH] Tagging 0.9.25 Signed-off-by: Florian Aders (EleRas) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 7 +++++++ lib/tables.inc.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 85d9ff6b..5c0f9956 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.25-rc1'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.25'); 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 42458010..2d21427b 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1717,4 +1717,11 @@ if(isFroxlorVersion('0.9.24')) updateToVersion('0.9.25-rc1'); } +if(isFroxlorVersion('0.9.25-rc1')) +{ + showUpdateStep("Updating from 0.9.25-rc1 to 0.9.25"); + lastStepStatus(0); + + updateToVersion('0.9.25'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 434f9ced..2edbb16a 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.25-rc1'; +$version = '0.9.25'; $dbversion = '2'; $branding = '';