diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php index f32a67f679ac4afad0440ab24100afa30b25631d..79f8dd85d240a7e85312819c7c4a189b1817dc32 100644 --- a/server/lib/classes/letsencrypt.inc.php +++ b/server/lib/classes/letsencrypt.inc.php @@ -254,22 +254,11 @@ class letsencrypt { $cli_domain_arg .= (string) " --domains " . $temp_domain; } - $le_files = $this->get_letsencrypt_certificate_paths($temp_domains); - // unset useless data unset($subdomains); unset($aliasdomains); unset($temp_domains); - if($server_type != 'apache' || version_compare($app->system->getapacheversion(true), '2.4.8', '>=')) { - $crt_tmp_file = $le_files['fullchain']; - } else { - $crt_tmp_file = $le_files['cert']; - } - - $key_tmp_file = $le_files['privkey']; - $bundle_tmp_file = $le_files['chain']; - $letsencrypt_cmd = ''; $success = false; if(!empty($cli_domain_arg)) { @@ -284,6 +273,17 @@ class letsencrypt { } } + $le_files = $this->get_letsencrypt_certificate_paths($temp_domains); + + if($server_type != 'apache' || version_compare($app->system->getapacheversion(true), '2.4.8', '>=')) { + $crt_tmp_file = $le_files['fullchain']; + } else { + $crt_tmp_file = $le_files['cert']; + } + + $key_tmp_file = $le_files['privkey']; + $bundle_tmp_file = $le_files['chain']; + if(!$success) { // error issuing cert $app->log('Let\'s Encrypt SSL Cert for: ' . $domain . ' could not be issued.', LOGLEVEL_WARN);