Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix acme.sh listing

Browse Source
This commit is contained in:
VirtuBox
2019-08-30 07:46:53 +02:00
parent d8c391ff54
commit 4e95fd9fba
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wo/cli/plugins/site_functions.py
View File

@@ -1472,14 +1472,9 @@ def checkWildcardExist(self, wo_domain_name):
wo_acme_exec = ("/etc/letsencrypt/acme.sh --config-home " wo_acme_exec = ("/etc/letsencrypt/acme.sh --config-home "
"'/etc/letsencrypt/config'") "'/etc/letsencrypt/config'")
try: # export certificates list from acme.sh
# export certificates list from acme.sh WOShellExec.cmd_exec(self, "{0} ".format(wo_acme_exec) +
WOShellExec.cmd_exec(self, "{0} ".format(wo_acme_exec) + "--list --listraw > /var/lib/wo/cert.csv")
"--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")
# define new csv dialect # define new csv dialect
csv.register_dialect('acmeconf', delimiter='|') csv.register_dialect('acmeconf', delimiter='|')
@@ -1497,6 +1492,8 @@ def checkWildcardExist(self, wo_domain_name):
except csv.Error as e: except csv.Error as e:
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
Log.error(self, "Failed to read cert list") Log.error(self, "Failed to read cert list")
finally:
wo_cert.close()
# copy wildcard certificate to a subdomain # copy wildcard certificate to a subdomain