From 394ec4cd4a39c20d0f755a5d7c16c0c8589fd737 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Sun, 31 May 2020 09:13:22 +0200 Subject: [PATCH] fix ecc certificate paths 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 677d1cbe..959dd2aa 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -492,10 +492,6 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron private static function checkFsFilesAreNewer($domain, $cert_date = 0) { $certificate_folder = self::getWorkingDirFromEnv($domain); - if (Settings::Get('system.leecc') > 0) { - $certificate_folder .= "_ecc"; - } - $certificate_folder = \Froxlor\FileDir::makeCorrectDir($certificate_folder); $ssl_file = \Froxlor\FileDir::makeCorrectFile($certificate_folder . '/' . $domain . '.cer'); if (is_dir($certificate_folder) && file_exists($ssl_file) && is_readable($ssl_file)) { @@ -509,6 +505,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron public static function getWorkingDirFromEnv($domain = "") { + if (Settings::Get('system.leecc') > 0) { + $domain .= "_ecc"; + } $env_file = FileDir::makeCorrectFile(dirname(self::$acmesh) . '/acme.sh.env'); if (file_exists($env_file)) { $output = [];