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

Double check whether installation of acme.sh worked when not installed yet and do not continue if not; fixes #823

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-04-14 08:10:36 +02:00
parent 8bdd843bd9
commit 9018404faa
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,9 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
self::$apiserver = 'https://acme-' . (Settings::Get('system.letsencryptca') == 'testing' ? 'staging-' : '') . 'v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory'; self::$apiserver = 'https://acme-' . (Settings::Get('system.letsencryptca') == 'testing' ? 'staging-' : '') . 'v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory';
// validate acme.sh installation // validate acme.sh installation
self::checkInstall(); if (! self::checkInstall()) {
return - 1;
}
// flag for re-generation of vhost files // flag for re-generation of vhost files
$changedetected = 0; $changedetected = 0;
@@ -525,15 +527,22 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
/** /**
* install acme.sh if not found yet * install acme.sh if not found yet
*/ */
private static function checkInstall() private static function checkInstall($tries = 0)
{ {
if (! file_exists(self::$acmesh)) { if (! file_exists(self::$acmesh) && $tries > 0) {
FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_ERR, "Download/installation of acme.sh seems to have failed. Re-run cronjob to try again or install manually to '" . self::$acmesh . "'");
echo PHP_EOL . "Download/installation of acme.sh seems to have failed. Re-run cronjob to try again or install manually to '" . self::$acmesh . "'" . PHP_EOL;
return false;
} else if (! file_exists(self::$acmesh)) {
FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Could not find acme.sh - installing it to /root/.acme.sh/"); FroxlorLogger::getInstanceOf()->logAction(FroxlorLogger::CRON_ACTION, LOG_INFO, "Could not find acme.sh - installing it to /root/.acme.sh/");
$return = false; $return = false;
\Froxlor\FileDir::safe_exec("wget -O - https://get.acme.sh | sh", $return, array( \Froxlor\FileDir::safe_exec("wget -O - https://get.acme.sh | sh", $return, array(
'|' '|'
)); ));
// check whether the installation worked
return self::checkInstall(++ $tries);
} }
return true;
} }
/** /**