From 2c98fc4c2d2522ab3e8006b5e968bc8a39f0ff56 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Thu, 4 Jun 2020 07:42:13 +0200 Subject: [PATCH] fix wrong certificate folder for fallback ceck (ecc/non-ecc) Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 959dd2aa..a5cb15b2 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -503,9 +503,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron return false; } - public static function getWorkingDirFromEnv($domain = "") + public static function getWorkingDirFromEnv($domain = "", $forced_noecc = false) { - if (Settings::Get('system.leecc') > 0) { + if (Settings::Get('system.leecc') > 0 && !$forced_noecc) { $domain .= "_ecc"; } $env_file = FileDir::makeCorrectFile(dirname(self::$acmesh) . '/acme.sh.env'); @@ -539,8 +539,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $certificate_folder = self::getWorkingDirFromEnv($domain); $certificate_folder_noecc = null; if (Settings::Get('system.leecc') > 0) { - $certificate_folder_noecc = \Froxlor\FileDir::makeCorrectDir($certificate_folder); - $certificate_folder .= "_ecc"; + $certificate_folder_noecc = self::getWorkingDirFromEnv($domain, true); } $certificate_folder = \Froxlor\FileDir::makeCorrectDir($certificate_folder);