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

check for upgrade of acme.sh prior to issue/renew certifice, refs #657

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2019-02-17 20:48:11 +01:00
parent 2273a11978
commit 010f30bc9e
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,11 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
*/ */
private static $upddom_stmt = null; private static $upddom_stmt = null;
private static $do_update = true;
public static function run() public static function run()
{ {
self::checkInstall(); self::checkInstall();
self::checkUpgrade();
self::$apiserver = 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory'; self::$apiserver = 'https://acme-v0' . \Froxlor\Settings::Get('system.leapiversion') . '.api.letsencrypt.org/directory';
@@ -252,6 +253,12 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
private static function runAcmeSh($certrow = array(), $domains = array(), $cert_mode = 'issue', &$cronlog = null, &$changedetected = 0) private static function runAcmeSh($certrow = array(), $domains = array(), $cert_mode = 'issue', &$cronlog = null, &$changedetected = 0)
{ {
if (! empty($domains)) { if (! empty($domains)) {
if (self::$do_update) {
self::checkUpgrade();
self::$do_update = false;
}
$acmesh_cmd = self::$acmesh . " --auto-upgrade 0 --server " . self::$apiserver . " --" . $cert_mode . " -d " . implode(" -d ", $domains); $acmesh_cmd = self::$acmesh . " --auto-upgrade 0 --server " . self::$apiserver . " --" . $cert_mode . " -d " . implode(" -d ", $domains);
if ($cert_mode == 'issue') { if ($cert_mode == 'issue') {
@@ -332,16 +339,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
private static function checkUpgrade() private static function checkUpgrade()
{ {
$lastcheck = \Froxlor\FileDir::makeCorrectFile(dirname(self::$acmesh) . '/.froxlor.lastupdate'); $acmesh_result = \Froxlor\FileDir::safe_exec(self::$acmesh . " --upgrade");
if (! file_exists($lastcheck)) { FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, "Checking for LetsEncrypt client upgrades before renewing certificates:\n" . implode("\n", $acmesh_result));
file_put_contents($lastcheck, time());
}
$updatets = file_get_contents($lastcheck);
if ((int) trim($updatets) < (time() - 24 * 60 * 60)) {
$acmesh_result = \Froxlor\FileDir::safe_exec(self::$acmesh . " --upgrade");
FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, "Checking for LetsEncrypt client upgrades before renewing certificates:\n" . implode("\n", $acmesh_result));
file_put_contents($lastcheck, time());
}
} }
} }