report error if no Let's Encrypt client

jnorell · jnorell · commit 76647e891770 · 2021-01-29T10:02:26.000-07:00
diff --git a/server/lib/classes/letsencrypt.inc.php b/server/lib/classes/letsencrypt.inc.php
@@ -317,10 +317,14 @@ public function request_certificates($data, $server_type = 'apache') {
 		if($this->get_acme_script()) {
 			$use_acme = true;
 		} elseif(!$this->get_certbot_script()) {
+			$app->log("Unable to find Let's Encrypt client, installing acme.sh.", LOGLEVEL_DEBUG);
 			// acme and le missing
 			$this->install_acme();
 			if($this->get_acme_script()) {
 				$use_acme = true;
+			} else {
+				$app->log("Unable to install acme.sh.  Cannot proceed, no Let's Encrypt client found.", LOGLEVEL_WARN);
+				return false;
 			}
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -317,10 +317,14 @@ public function request_certificates($data, $server_type = 'apache') {`
`317`	`317`	`if($this->get_acme_script()) {`
`318`	`318`	`$use_acme = true;`
`319`	`319`	`} elseif(!$this->get_certbot_script()) {`
	`320`	`+ $app->log("Unable to find Let's Encrypt client, installing acme.sh.", LOGLEVEL_DEBUG);`
`320`	`321`	`// acme and le missing`
`321`	`322`	`$this->install_acme();`
`322`	`323`	`if($this->get_acme_script()) {`
`323`	`324`	`$use_acme = true;`
	`325`	`+ } else {`
	`326`	`+ $app->log("Unable to install acme.sh. Cannot proceed, no Let's Encrypt client found.", LOGLEVEL_WARN);`
	`327`	`+ return false;`
`324`	`328`	`}`
`325`	`329`	`}`
`326`	`330`