From 42b3f1e59d9f4fc84c7ffe775d6cae7ea6bfc525 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Fri, 20 Jan 2023 18:01:28 +0100 Subject: [PATCH] set version to 2.0.9 Signed-off-by: Michael Kaufmann --- install/froxlor.sql.php | 4 ++-- install/updates/froxlor/update_2.x.inc.php | 5 +++++ install/updates/preconfig/preconfig_2.x.inc.php | 6 +++--- lib/Froxlor/Froxlor.php | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php index 11657149aa..8dfaf5d0c2 100644 --- a/install/froxlor.sql.php +++ b/install/froxlor.sql.php @@ -697,7 +697,7 @@ ('system', 'distribution', ''), ('system', 'update_channel', 'stable'), ('system', 'updatecheck_data', ''), - ('system', 'update_notify_last', '2.0.8'), + ('system', 'update_notify_last', '2.0.9'), ('system', 'traffictool', 'goaccess'), ('api', 'enabled', '0'), ('2fa', 'enabled', '1'), @@ -741,7 +741,7 @@ ('panel', 'logo_overridetheme', '0'), ('panel', 'logo_overridecustom', '0'), ('panel', 'settings_mode', '0'), - ('panel', 'version', '2.0.8'), + ('panel', 'version', '2.0.9'), ('panel', 'db_version', '202301180'); diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php index f35fab6af6..476770f315 100644 --- a/install/updates/froxlor/update_2.x.inc.php +++ b/install/updates/froxlor/update_2.x.inc.php @@ -372,3 +372,8 @@ Froxlor::updateToDbVersion('202301180'); } + +if (Froxlor::isFroxlorVersion('2.0.8')) { + Update::showUpdateStep("Updating from 2.0.8 to 2.0.9", false); + Froxlor::updateToVersion('2.0.9'); +} diff --git a/install/updates/preconfig/preconfig_2.x.inc.php b/install/updates/preconfig/preconfig_2.x.inc.php index d299f694b3..5eb3d97de7 100644 --- a/install/updates/preconfig/preconfig_2.x.inc.php +++ b/install/updates/preconfig/preconfig_2.x.inc.php @@ -92,9 +92,9 @@ } if (Update::versionInUpdate($current_db_version, '202301180')) { - //if ((int) Settings::Get('system.leenabled') == 1) { + if ((int) Settings::Get('system.leenabled') == 1) { $has_preconfig = true; - $description = 'Froxlor now supports to set a external DNS resolver for the Let\'s Encrypt pre-check.'; + $description = 'Froxlor now supports to set an external DNS resolver for the Let\'s Encrypt pre-check.'; $question = 'Specify a DNS resolver IP (recommended value: 1.1.1.1 or similar)'; $return['system_le_domain_dnscheck_resolver'] = [ 'type' => 'text', @@ -104,7 +104,7 @@ 'label' => $question, 'prior_infotext' => $description, ]; - //} + } } $preconfig['fields'] = $return; diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php index b886fecee3..c8ed31a8e0 100644 --- a/lib/Froxlor/Froxlor.php +++ b/lib/Froxlor/Froxlor.php @@ -31,7 +31,7 @@ final class Froxlor { // Main version variable - const VERSION = '2.0.8'; + const VERSION = '2.0.9'; // Database version (YYYYMMDDC where C is a daily counter) const DBVERSION = '202301180';