From a647d48fbed68a1f6646490ef9a1ed6bc12e9a39 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Mon, 27 May 2019 17:48:33 +0200 Subject: [PATCH] fix up testing/production switch and challengepath for lets encrypt, fixes #696 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 07e1ec27..70b398fc 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -272,7 +272,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $acmesh_cmd = self::$acmesh . " --auto-upgrade 0 --server " . self::$apiserver . " --" . $cert_mode . " -d " . implode(" -d ", $domains); if ($cert_mode == 'issue') { - $acmesh_cmd .= " -w " . \Froxlor\Froxlor::getInstallDir(); + $acmesh_cmd .= " -w " . Settings::Get('system.letsencryptchallengepath'); } if (Settings::Get('system.leecc') > 0) { $acmesh_cmd .= " --keylength ec-" . Settings::Get('system.leecc'); @@ -282,6 +282,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron if (Settings::Get('system.letsencryptreuseold') != '1') { $acmesh_cmd .= " --always-force-new-domain-key"; } + if (Settings::Get('system.letsencryptca') == 'testing') { + $acmesh_cmd .= " --staging"; + } $acme_result = \Froxlor\FileDir::safe_exec($acmesh_cmd);