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

honor setting for let's encrypt key size if needed

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-02-17 19:47:51 +01:00
parent f5127eccd1
commit 5c36b79277
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,9 +180,15 @@ return array(
'label' => $lng['serversettings']['letsencryptkeysize'], 'label' => $lng['serversettings']['letsencryptkeysize'],
'settinggroup' => 'system', 'settinggroup' => 'system',
'varname' => 'letsencryptkeysize', 'varname' => 'letsencryptkeysize',
'type' => 'int', 'type' => 'option',
'int_min' => 2048, 'default' => '2048',
'default' => 4096, 'option_mode' => 'one',
'option_options' => array(
'2048' => '2048',
'3072' => '3072',
'4096' => '4096',
'8192' => '8192'
),
'save_method' => 'storeSettingField' 'save_method' => 'storeSettingField'
), ),
'system_leecc' => array( 'system_leecc' => array(

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

@@ -202,6 +202,7 @@ if (\Froxlor\Froxlor::isDatabaseVersion('201902120')) {
showUpdateStep("Adding new ECC / ECDSA setting for Let's Encrypt"); showUpdateStep("Adding new ECC / ECDSA setting for Let's Encrypt");
Settings::AddNew('system.leecc', '0'); Settings::AddNew('system.leecc', '0');
Database::query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `cronclass` = '\\Froxlor\\Cron\\Http\\LetsEncrypt\\AcmeSh' WHERE `cronfile` = 'letsencrypt'"); Database::query("UPDATE `" . TABLE_PANEL_CRONRUNS . "` SET `cronclass` = '\\Froxlor\\Cron\\Http\\LetsEncrypt\\AcmeSh' WHERE `cronfile` = 'letsencrypt'");
Settings::Set('system.letsencryptkeysize', '2048', true);
lastStepStatus(0); lastStepStatus(0);
showUpdateStep("Removing current Let's Encrypt certificates due to new implementation of acme.sh"); showUpdateStep("Removing current Let's Encrypt certificates due to new implementation of acme.sh");

2
lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php
View File

@@ -259,6 +259,8 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
} }
if (Settings::Get('system.leecc') > 0) { if (Settings::Get('system.leecc') > 0) {
$acmesh_cmd .= " --keylength ec-" . Settings::Get('system.leecc'); $acmesh_cmd .= " --keylength ec-" . Settings::Get('system.leecc');
} else {
$acmesh_cmd .= " --keylength " . Settings::Set('system.letsencryptkeysize');
} }
if (Settings::Get('system.letsencryptreuseold') != '1') { if (Settings::Get('system.letsencryptreuseold') != '1') {
$acmesh_cmd .= " --always-force-new-domain-key"; $acmesh_cmd .= " --always-force-new-domain-key";