From efc5f37850affdd10124012d67c009bf0c036640 Mon Sep 17 00:00:00 2001 From: Florian Aders Date: Mon, 1 Feb 2016 20:58:49 +0100 Subject: [PATCH] Well, we need a new key if we don't havre one, not if we already have one Signed-off-by: Florian Aders --- lib/classes/ssl/class.lescript.php | 2 +- scripts/jobs/cron_letsencrypt.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/classes/ssl/class.lescript.php b/lib/classes/ssl/class.lescript.php index 200dd408..ab4a30a3 100644 --- a/lib/classes/ssl/class.lescript.php +++ b/lib/classes/ssl/class.lescript.php @@ -182,7 +182,7 @@ class lescript // ---------------------- // generate private key for domain if not exist - if(!is_null($domainkey)) { + if(empty($domainkey)) { $keys = $this->generateKey(); $domainkey = $keys['private']; } diff --git a/scripts/jobs/cron_letsencrypt.php b/scripts/jobs/cron_letsencrypt.php index 19474754..6bd373a1 100644 --- a/scripts/jobs/cron_letsencrypt.php +++ b/scripts/jobs/cron_letsencrypt.php @@ -22,7 +22,7 @@ fwrite($debugHandler, "updating let's encrypt certificates\n"); $certificates_stmt = Database::query(" SELECT domssl.`id`, domssl.`domainid`, domssl.expirationdate, domssl.`ssl_cert_file`, domssl.`ssl_key_file`, domssl.`ssl_ca_file`, dom.`domain`, dom.`iswildcarddomain`, dom.`wwwserveralias`, - dom.`documentroot`, cust.`leprivatekey`, cust.`lepublickey`, cust.customerid + dom.`documentroot`, dom.`id` as 'domainid', cust.`leprivatekey`, cust.`lepublickey`, cust.customerid FROM `".TABLE_PANEL_CUSTOMERS."` as cust, `".TABLE_PANEL_DOMAINS."` dom LEFT JOIN `".TABLE_PANEL_DOMAIN_SSL_SETTINGS."` domssl ON (dom.id = domssl.domainid) WHERE dom.customerid = cust.customerid AND dom.letsencrypt = 1 AND (domssl.expirationdate < DATE_ADD(NOW(), INTERVAL 30 DAY) OR domssl.expirationdate IS NULL) ");