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

Merge branch 'master' of github.com:Froxlor/Froxlor

Browse Source
This commit is contained in:
Michael Kaufmann
2019-02-17 19:34:33 +01:00
parent 459cbcc0dd 6d8521d8dc
commit e962f76b32
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
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';
@@ -173,7 +174,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
)); ));
// Initialize Lescript with documentroot // Initialize Lescript with documentroot
$acmesh_cmd = self::$acmesh . " --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') {
$acmesh_cmd .= " -w " . \Froxlor\Froxlor::getInstallDir(); $acmesh_cmd .= " -w " . \Froxlor\Froxlor::getInstallDir();
@@ -263,7 +264,7 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
} }
// Initialize Lescript with documentroot // Initialize Lescript with documentroot
$acmesh_cmd = self::$acmesh . " --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') {
$acmesh_cmd .= " -w " . \Froxlor\Froxlor::getInstallDir(); $acmesh_cmd .= " -w " . \Froxlor\Froxlor::getInstallDir();
@@ -344,9 +345,15 @@ class AcmeSh extends \Froxlor\Cron\FroxlorCron
if (! file_exists(self::$acmesh)) { if (! file_exists(self::$acmesh)) {
FroxlorLogger::getInstanceOf()->logAction(\Froxlor\FroxlorLogger::CRON_ACTION, LOG_INFO, "Could not find acme.sh - installing it to /root/.acme.sh/"); FroxlorLogger::getInstanceOf()->logAction(\Froxlor\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(
'|' '|'
)); ));
} }
} }
private static function checkUpgrade()
{
$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));
}
} }