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

fix wrong certificate folder for fallback ceck (ecc/non-ecc)

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-06-04 07:42:13 +02:00
parent 65e1f633ef
commit 2c98fc4c2d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,9 +503,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
return false; 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"; $domain .= "_ecc";
} }
$env_file = FileDir::makeCorrectFile(dirname(self::$acmesh) . '/acme.sh.env'); $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 = self::getWorkingDirFromEnv($domain);
$certificate_folder_noecc = null; $certificate_folder_noecc = null;
if (Settings::Get('system.leecc') > 0) { if (Settings::Get('system.leecc') > 0) {
$certificate_folder_noecc = \Froxlor\FileDir::makeCorrectDir($certificate_folder); $certificate_folder_noecc = self::getWorkingDirFromEnv($domain, true);
$certificate_folder .= "_ecc";
} }
$certificate_folder = \Froxlor\FileDir::makeCorrectDir($certificate_folder); $certificate_folder = \Froxlor\FileDir::makeCorrectDir($certificate_folder);