From 0d99f51698ea0a964565d11cb3e33234c857bf4f Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Tue, 13 Nov 2018 20:06:13 +0100 Subject: [PATCH] - fixed LE command not being called --- server/lib/classes/letsencrypt.inc.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php index 600c79f345..a353b8206f 100644 --- a/server/lib/classes/letsencrypt.inc.php +++ b/server/lib/classes/letsencrypt.inc.php @@ -63,6 +63,10 @@ class letsencrypt { $cmd .= (string) " -d " . $domain; } + if($cmd == '') { + return false; + } + $cmd = $letsencrypt . " --issue $cmd -w /usr/local/ispconfig/interface/acme && " . $letsencrypt . " --install-cert " . $cmd . " --key-file " . escapeshellarg($key_file) . " --fullchain-file " . escapeshellarg($bundle_file) . " --cert-file " . escapeshellarg($cert_file) . " --reloadcmd " . escapeshellarg($this->get_reload_command()); return $cmd; @@ -121,6 +125,10 @@ class letsencrypt { $cmd .= (string) " --domains " . $domain; } + if($cmd == '') { + return false; + } + $matches = array(); $ret = null; $val = 0; @@ -375,7 +383,7 @@ class letsencrypt { } $success = false; - if(!empty($cli_domain_arg)) { + if(!$letsencrypt_cmd) { if(!isset($server_config['migration_mode']) || $server_config['migration_mode'] != 'y') { $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG); $app->log("Let's Encrypt SSL Cert domains: $cli_domain_arg", LOGLEVEL_DEBUG); -- GitLab