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

fix double-adding of _ecc to certificate folder when deleting let's encrypt certificate

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-06-17 12:08:54 +02:00
parent daa223ed42
commit 70677fced2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Froxlor/Domain/Domain.php
View File

@@ -332,10 +332,6 @@ class Domain
$acmesh = \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::getAcmeSh(); $acmesh = \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::getAcmeSh();
if (file_exists($acmesh)) { if (file_exists($acmesh)) {
$certificate_folder = \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::getWorkingDirFromEnv($domainname); $certificate_folder = \Froxlor\Cron\Http\LetsEncrypt\AcmeSh::getWorkingDirFromEnv($domainname);
if (\Froxlor\Settings::Get('system.leecc') > 0) {
$certificate_folder .= "_ecc";
}
$certificate_folder = \Froxlor\FileDir::makeCorrectDir($certificate_folder);
if (file_exists($certificate_folder)) { if (file_exists($certificate_folder)) {
$params = " --remove -d " . $domainname; $params = " --remove -d " . $domainname;
if (\Froxlor\Settings::Get('system.leecc') > 0) { if (\Froxlor\Settings::Get('system.leecc') > 0) {