maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

force Let's Encrypt ACMEv2 API, fixed #728

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-10-11 18:17:05 +02:00
parent fb54b887f2
commit 0d0e557715
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
actions/admin/settings/131.ssl.php
View File

@@ -141,7 +141,6 @@ return array(
'default' => '2', 'default' => '2',
'option_mode' => 'one', 'option_mode' => 'one',
'option_options' => array( 'option_options' => array(
'1' => 'ACME v1',
'2' => 'ACME v2' '2' => 'ACME v2'
), ),
'save_method' => 'storeSettingField' 'save_method' => 'storeSettingField'

2
install/froxlor.sql
View File

@@ -686,7 +686,7 @@ opcache.interned_strings_buffer'),
('panel', 'customer_hide_options', ''), ('panel', 'customer_hide_options', ''),
('panel', 'is_configured', '0'), ('panel', 'is_configured', '0'),
('panel', 'version', '0.10.1'), ('panel', 'version', '0.10.1'),
('panel', 'db_version', '201910090'); ('panel', 'db_version', '201910110');
DROP TABLE IF EXISTS `panel_tasks`; DROP TABLE IF EXISTS `panel_tasks`;

9
install/updates/froxlor/0.10/update_0.10.inc.php
View File

@@ -359,3 +359,12 @@ if (\Froxlor\Froxlor::isFroxlorVersion('0.10.0')) {
showUpdateStep("Updating from 0.10.0 to 0.10.1 final", false); showUpdateStep("Updating from 0.10.0 to 0.10.1 final", false);
\Froxlor\Froxlor::updateToVersion('0.10.1'); \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');
}

2
lib/Froxlor/Froxlor.php
View File

@@ -10,7 +10,7 @@ final class Froxlor
const VERSION = '0.10.1'; const VERSION = '0.10.1';
// Database version (YYYYMMDDC where C is a daily counter) // Database version (YYYYMMDDC where C is a daily counter)
const DBVERSION = '201910090'; const DBVERSION = '201910110';
// Distribution branding-tag (used for Debian etc.) // Distribution branding-tag (used for Debian etc.)
const BRANDING = ''; const BRANDING = '';