From 5249479c893a9ddccbd84173015237844a1ef66e Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 23 Sep 2019 01:40:26 +0200 Subject: [PATCH] Display domain type to acme process --- CHANGELOG.md | 2 ++ wo/cli/plugins/site.py | 6 ++++++ wo/cli/plugins/site_functions.py | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3307fcf..84590ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), #### Changed - [APP] WordOps dashboard updated to v1.2, shipped as a html file, it can be used without PHP stack +- [STACK] Refactor Let's Encrypt with acme.sh +- [STACK] Log error improved with acme.sh depending on the acme challenge (DNS API or Webroot) #### Fixed diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 0823eb7..d48fdd9 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -759,11 +759,14 @@ class WOSiteCreateController(CementBaseController): acme_wildcard = False if acme_subdomain is True: + Log.info(self, "Certificate type : subdomain") acme_domains = acme_domains + ['{0}'.format(wo_domain)] elif acme_wildcard is True: + Log.info(self, "Certificate type : wildcard") acme_domains = acme_domains + ['{0}'.format(wo_domain), '*.{0}'.format(wo_domain)] else: + Log.info(self, "Certificate type : domain") acme_domains = acme_domains + ['{0}'.format(wo_domain), 'www.{0}'.format(wo_domain)] @@ -1388,11 +1391,14 @@ class WOSiteUpdateController(CementBaseController): acmedata['acme_dns'] = pargs.dns # Set list of domains to secure if acme_subdomain is True: + Log.info(self, "Certificate type : subdomain") acme_domains = acme_domains + ['{0}'.format(wo_domain)] elif acme_wildcard is True: + Log.info(self, "Certificate type : wildcard") acme_domains = acme_domains + ['{0}'.format(wo_domain), '*.{0}'.format(wo_domain)] else: + Log.info(self, "Certificate type : domain") acme_domains = acme_domains + ['{0}'.format(wo_domain), 'www.{0}'.format(wo_domain)] diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 20376b9..282021a 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1594,7 +1594,7 @@ def setuprocketchat(self): if ((not WOVariables.wo_platform_codename == 'bionic') and (not WOVariables.wo_platform_codename == 'xenial')): Log.info(self, "Rocket.chat is only available on Ubuntu 16.04 " - "& 18.04 LTS") + "& 18.04 LTS") return False else: if not WOAptGet.is_installed(self, 'snapd'):