security/acme-client: Fixes for periodic script

  - Fix domains and client-args variable typos [1]
  - Don't display deploy messages when deploy-script unset[2]

PR:		213162 [1], 213163 [2]
Submitted by:	peterj

1 files changed, 10 insertions, 10 deletions

diff --git a/security/acme-client/files/000.acme-client.sh.in b/security/acme-client/files/000.acme-client.sh.in
index bfb6ec6bf046..46f352d3b69a 100644
--- a/security/acme-client/files/000.acme-client.sh.in
+++ b/security/acme-client/files/000.acme-client.sh.in
@@ -32,27 +32,27 @@ case "$weekly_acme_client_enable" in
 	echo
 	echo "Checking Let's Encrypt certificate status:"
 
-        : ${weekly_acme_client_args:="-b"}
-
 	if [ -x "$weekly_acme_client_renewscript" ] ; then
 		$weekly_acme_client_renewscript
 	else
+		: ${weekly_acme_client_args:="-b"}
 		if [ -z "$weekly_acme_client_domains" ] ; then
-			weekly_acme-client_domains=$(hostname -f)
+			weekly_acme_client_domains=$(hostname -f)
 			echo "Using hostname: $weekly_acme_client_domains"
 		fi
 		if [ -n "$weekly_acme_client_challengedir" ] ; then
-			weekly_acme-client_args="$weekly_acme_client_args -C $weekly_acme_client_challengedir"
+			weekly_acme_client_args="$weekly_acme_client_args -C $weekly_acme_client_challengedir"
 		fi
 		%%LOCALBASE%%/bin/acme-client $weekly_acme_client_args $weekly_acme_client_domains
 	fi
 
-	echo "Deploying Let's Encrypt certificates:"
-
-	if [ -x "$weekly_acme_client_deployscript" ] ; then
-		$weekly_acme_client_deployscript
-	else
-		echo 'Skipped, deploy script not set.'
+	if [ -n "$weekly_acme_client_deployscript" ] ; then
+		if [ -x "$weekly_acme_client_deployscript" ] ; then
+			echo "Deploying Let's Encrypt certificates:"
+			$weekly_acme_client_deployscript
+		else
+			echo 'Skipped, deploy script does not exist or is not executable'
+		fi
 	fi
         ;;
     *)