rixty
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix for issues #6918 and #6956 (#6991) 

* Fix for issues #6918 and #6956

* formatting
This commit is contained in:
Stefan Körfgen 2024-03-04 21:15:52 +01:00 committed by GitHub
parent 74b8eece33
commit 76fc4e8ac0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Service/Acme.php
View File

@ -131,7 +131,9 @@ final class Acme
&& empty(array_diff($domains, $acme->getSAN('file://' . $acmeDir . '/acme.crt')))
&& $acme->getRemainingDays('file://' . $acmeDir . '/acme.crt') > self::THRESHOLD_DAYS
) {
$this->checkLinks($acmeDir);
if (!$this->checkLinks($acmeDir)) {
$this->reloadServices();
}
throw new RuntimeException('Certificate does not need renewal.');
}
@ -169,10 +171,12 @@ final class Acme
// Symlink to the shared SSL cert.
$this->checkLinks($acmeDir);
$this->reloadServices();
$this->logger->notice('ACME certificate process successful.');
}
private function checkLinks(string $acmeDir): void
private function checkLinks(string $acmeDir): bool
{
$fs = new Filesystem();
@ -180,7 +184,7 @@ final class Acme
$fs->readlink($acmeDir . '/ssl.crt', true) === $acmeDir . '/acme.crt'
&& $fs->readlink($acmeDir . '/ssl.key', true) === $acmeDir . '/acme.key'
) {
return;
return true;
}
$fs->remove([
@ -191,7 +195,7 @@ final class Acme
$fs->symlink($acmeDir . '/acme.crt', $acmeDir . '/ssl.crt');
$fs->symlink($acmeDir . '/acme.key', $acmeDir . '/ssl.key');
$this->reloadServices();
return false;
}
private function reloadServices(): void