From 35c4e3d1b9fca840071853406fd603e290ca797d Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Fri, 6 Nov 2020 14:47:20 +0100
Subject: [PATCH] set version to 0.10.22 for upcoming maintenance release

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 install/froxlor.sql                              |  3 ++-
 install/updates/froxlor/0.10/update_0.10.inc.php | 10 ++++++++++
 lib/Froxlor/Froxlor.php                          |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/install/froxlor.sql b/install/froxlor.sql
index b12dfa83..72c3dc00 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -554,6 +554,7 @@ opcache.interned_strings_buffer'),
 	('system', 'ssl_cert_file', '/etc/apache2/apache2.pem'),
 	('system', 'use_ssl', '0'),
 	('system', 'default_vhostconf', ''),
+	('system', 'default_sslvhostconf', ''),
 	('system', 'mail_quota_enabled', '0'),
 	('system', 'mail_quota', '100'),
 	('system', 'webalizer_enabled', '1'),
@@ -704,7 +705,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'password_special_char', '!?<>§$%+#=@'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'is_configured', '0'),
-	('panel', 'version', '0.10.21'),
+	('panel', 'version', '0.10.22'),
 	('panel', 'db_version', '202009070');
 
 
diff --git a/install/updates/froxlor/0.10/update_0.10.inc.php b/install/updates/froxlor/0.10/update_0.10.inc.php
index acd798af..3c21a298 100644
--- a/install/updates/froxlor/0.10/update_0.10.inc.php
+++ b/install/updates/froxlor/0.10/update_0.10.inc.php
@@ -682,3 +682,13 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.20')) {
 	showUpdateStep("Updating from 0.10.20 to 0.10.21", false);
 	\Froxlor\Froxlor::updateToVersion('0.10.21');
 }
+
+if (\Froxlor\Froxlor::isFroxlorVersion('0.10.21')) {
+
+	showUpdateStep("Adding settings for ssl-vhost default content if not updated from db-version 201910110", true);
+	Settings::AddNew("system.default_sslvhostconf", '');
+	lastStepStatus(0);
+
+	showUpdateStep("Updating from 0.10.21 to 0.10.22", false);
+	\Froxlor\Froxlor::updateToVersion('0.10.22');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index 52c4002b..24900f9c 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -7,7 +7,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '0.10.21';
+	const VERSION = '0.10.22';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202009070';