From 4e95fd9fba8dad066cf7399b3cee6c9b2fa3a224 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Fri, 30 Aug 2019 07:46:53 +0200 Subject: [PATCH] Fix acme.sh listing --- wo/cli/plugins/site_functions.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 3a7fa1b..1aac6c5 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1472,14 +1472,9 @@ def checkWildcardExist(self, wo_domain_name): wo_acme_exec = ("/etc/letsencrypt/acme.sh --config-home " "'/etc/letsencrypt/config'") - try: - # export certificates list from acme.sh - WOShellExec.cmd_exec(self, "{0} ".format(wo_acme_exec) + - "--list --listraw > /var/lib/wo/cert.csv;" - " echo 'OK'") - except CommandExecutionError as e: - Log.debug(self, "{0}".format(e)) - Log.error(self, "Failed to export cert list") + # export certificates list from acme.sh + WOShellExec.cmd_exec(self, "{0} ".format(wo_acme_exec) + + "--list --listraw > /var/lib/wo/cert.csv") # define new csv dialect csv.register_dialect('acmeconf', delimiter='|') @@ -1497,6 +1492,8 @@ def checkWildcardExist(self, wo_domain_name): except csv.Error as e: Log.debug(self, "{0}".format(e)) Log.error(self, "Failed to read cert list") + finally: + wo_cert.close() # copy wildcard certificate to a subdomain