From aa45a0302e55b0feb6d3d576373b638a243e668f Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 29 Jul 2020 08:23:49 +0200 Subject: [PATCH] fix permanent rebuilding of vhost configs, refs 0af655f10650777c31ed1cd40d059d08cf79b466 Signed-off-by: Michael Kaufmann --- lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php index 4b70d6ce..3e7338e3 100644 --- a/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php +++ b/lib/Froxlor/Cron/Http/LetsEncrypt/AcmeSh.php @@ -63,7 +63,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron $issue_domains = self::issueDomains(); $renew_froxlor = self::renewFroxlorVhost(); $renew_domains = self::renewDomains(true); - if ($issue_froxlor || $issue_domains || $renew_froxlor || $renew_domains) { + if ($issue_froxlor || !empty($issue_domains) || !empty($renew_froxlor) || $renew_domains) { // insert task to generate certificates and vhost-configs \Froxlor\System\Cronjob::inserttask(1); } @@ -399,8 +399,8 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron "); $froxlor_ssl = Database::pexecute_first($froxlor_ssl_settings_stmt); // also check for possible existing certificate - if ($froxlor_ssl || (! $froxlor_ssl && ! self::checkFsFilesAreNewer(Settings::Get('system.hostname'), date('Y-m-d H:i:s', 0)))) { - return ($froxlor_ssl ? $froxlor_ssl : true); + if ($froxlor_ssl && self::checkFsFilesAreNewer(Settings::Get('system.hostname'), $froxlor_ssl['expirationdate'])) { + return $froxlor_ssl; } } return false;