From 0d0e55771523f2150a6e18d45b38dcbe11dd9549 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Fri, 11 Oct 2019 18:17:05 +0200
Subject: [PATCH] force Let's Encrypt ACMEv2 API, fixed #728

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 actions/admin/settings/131.ssl.php               | 1 -
 install/froxlor.sql                              | 2 +-
 install/updates/froxlor/0.10/update_0.10.inc.php | 9 +++++++++
 lib/Froxlor/Froxlor.php                          | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/actions/admin/settings/131.ssl.php b/actions/admin/settings/131.ssl.php
index 520a0b59..b292dc0a 100644
--- a/actions/admin/settings/131.ssl.php
+++ b/actions/admin/settings/131.ssl.php
@@ -141,7 +141,6 @@ return array(
 					'default' => '2',
 					'option_mode' => 'one',
 					'option_options' => array(
-						'1' => 'ACME v1',
 						'2' => 'ACME v2'
 					),
 					'save_method' => 'storeSettingField'
diff --git a/install/froxlor.sql b/install/froxlor.sql
index 79581933..df96ec7e 100644
--- a/install/froxlor.sql
+++ b/install/froxlor.sql
@@ -686,7 +686,7 @@ opcache.interned_strings_buffer'),
 	('panel', 'customer_hide_options', ''),
 	('panel', 'is_configured', '0'),
 	('panel', 'version', '0.10.1'),
-	('panel', 'db_version', '201910090');
+	('panel', 'db_version', '201910110');
 
 
 DROP TABLE IF EXISTS `panel_tasks`;
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 8961c27b..adbeb990 100644
--- a/install/updates/froxlor/0.10/update_0.10.inc.php
+++ b/install/updates/froxlor/0.10/update_0.10.inc.php
@@ -359,3 +359,12 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.0')) {
         showUpdateStep("Updating from 0.10.0 to 0.10.1 final", false);
         \Froxlor\Froxlor::updateToVersion('0.10.1');
 }
+
+if (\Froxlor\Froxlor::isDatabaseVersion('201910090')) {
+
+	showUpdateStep("Adjusting Let's Encrypt API setting");
+	Settings::AddNew("system.leapiversion", '2');
+	lastStepStatus(0);
+
+	\Froxlor\Froxlor::updateToDbVersion('201910110');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index 429c5e84..0dd1fecb 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -10,7 +10,7 @@ final class Froxlor
 	const VERSION = '0.10.1';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
-	const DBVERSION = '201910090';
+	const DBVERSION = '201910110';
 
 	// Distribution branding-tag (used for Debian etc.)
 	const BRANDING = '';