From 5e2981f41ea30bdda686a1005e2c499b44139a32 Mon Sep 17 00:00:00 2001
From: Florian Schaal <info@schaal-24.de>
Date: Tue, 14 Feb 2017 17:18:37 +0100
Subject: [PATCH] skip LE-call if no domain could be verified
---
server/plugins-available/apache2_plugin.inc.php | 9 +++++----
server/plugins-available/nginx_plugin.inc.php | 8 +++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index f675d07318..57cdd98bf7 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1255,13 +1255,14 @@ class apache2_plugin {
//* check if we have already a Let's Encrypt cert
//if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
// we must not skip if cert exists, otherwise changed domains (alias or sub) won't make it to the cert
- $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
- $app->log("Let's Encrypt SSL Cert domains: $lddomain", LOGLEVEL_DEBUG);
-
+ if(!empty($lddomain)) {
+ $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
+ $app->log("Let's Encrypt SSL Cert domains: $lddomain", LOGLEVEL_DEBUG);
+ }
$success = false;
$letsencrypt = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'));
$letsencrypt = reset($letsencrypt);
- if(is_executable($letsencrypt)) {
+ if(is_executable($letsencrypt) && !empty($lddomain)) {
$success = $this->_exec($letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
}
if(!$success) {
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
index 33814e5b60..23f6787b12 100644
--- a/server/plugins-available/nginx_plugin.inc.php
+++ b/server/plugins-available/nginx_plugin.inc.php
@@ -1329,13 +1329,15 @@ class nginx_plugin {
//* check if we have already a Let's Encrypt cert
//if(!file_exists($crt_tmp_file) && !file_exists($key_tmp_file)) {
// we must not skip if cert exists, otherwise changed domains (alias or sub) won't make it to the cert
- $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
- $app->log("Let's Encrypt SSL Cert domains: $lddomain", LOGLEVEL_DEBUG);
+ if(!empty($lddomain)) {
+ $app->log("Create Let's Encrypt SSL Cert for: $domain", LOGLEVEL_DEBUG);
+ $app->log("Let's Encrypt SSL Cert domains: $lddomain", LOGLEVEL_DEBUG);
+ }
$success = false;
$letsencrypt = explode("\n", shell_exec('which letsencrypt certbot /root/.local/share/letsencrypt/bin/letsencrypt'));
$letsencrypt = reset($letsencrypt);
- if(is_executable($letsencrypt)) {
+ if(is_executable($letsencrypt) && && !empty($lddomain)) {
$success = $this->_exec($letsencrypt . " certonly -n --text --agree-tos --expand --authenticator webroot --server https://acme-v01.api.letsencrypt.org/directory --rsa-key-size 4096 --email postmaster@$domain $lddomain --webroot-path /usr/local/ispconfig/interface/acme");
}
if(!$success) {
--
GitLab