Skip to content
GitLab
Commit 7d30386f authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch... 

Merge branch '6458-let-s-encrypt-ssl-certs-not-issued-due-to-changed-cert-path-for-ecc-certs' into 'develop'

Resolve "Let's Encrypt SSL certs not issued due to changed cert path for ECC certs"

Closes #6458

See merge request !1691
parents d53109aa 39b6810c
Pipeline #12970 passed with stage
in 7 seconds
Hide whitespace changes
Inline Side-by-side
install/lib/installer_base.lib.php
View file @ 7d30386f
......@@ -3145,11 +3145,11 @@ class installer_base {
$out = null;
$ret = null;
if($conf['nginx']['installed'] == true || $conf['apache']['installed'] == true) {
exec("$acme --issue --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
exec("$acme --issue --keylength 4096 --log $acme_log -w /usr/local/ispconfig/interface/acme -d " . escapeshellarg($hostname) . " $renew_hook", $out, $ret);
}
// Else, it is not webserver, so we use standalone
else {
exec("$acme --issue --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
exec("$acme --issue --keylength 4096 --log $acme_log --standalone -d " . escapeshellarg($hostname) . " $hook", $out, $ret);
}
if($ret == 0 || ($ret == 2 && file_exists($check_acme_file))) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment