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

Display domain type to acme process

Browse Source
This commit is contained in:
VirtuBox
2019-09-23 01:40:26 +02:00
parent 818e36afbc
commit 5249479c89
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -11,6 +11,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
#### Changed #### Changed
- [APP] WordOps dashboard updated to v1.2, shipped as a html file, it can be used without PHP stack - [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 #### Fixed

6
wo/cli/plugins/site.py
View File

@@ -759,11 +759,14 @@ class WOSiteCreateController(CementBaseController):
acme_wildcard = False acme_wildcard = False
if acme_subdomain is True: if acme_subdomain is True:
Log.info(self, "Certificate type : subdomain")
acme_domains = acme_domains + ['{0}'.format(wo_domain)] acme_domains = acme_domains + ['{0}'.format(wo_domain)]
elif acme_wildcard is True: elif acme_wildcard is True:
Log.info(self, "Certificate type : wildcard")
acme_domains = acme_domains + ['{0}'.format(wo_domain), acme_domains = acme_domains + ['{0}'.format(wo_domain),
'*.{0}'.format(wo_domain)] '*.{0}'.format(wo_domain)]
else: else:
Log.info(self, "Certificate type : domain")
acme_domains = acme_domains + ['{0}'.format(wo_domain), acme_domains = acme_domains + ['{0}'.format(wo_domain),
'www.{0}'.format(wo_domain)] 'www.{0}'.format(wo_domain)]
@@ -1388,11 +1391,14 @@ class WOSiteUpdateController(CementBaseController):
acmedata['acme_dns'] = pargs.dns acmedata['acme_dns'] = pargs.dns
# Set list of domains to secure # Set list of domains to secure
if acme_subdomain is True: if acme_subdomain is True:
Log.info(self, "Certificate type : subdomain")
acme_domains = acme_domains + ['{0}'.format(wo_domain)] acme_domains = acme_domains + ['{0}'.format(wo_domain)]
elif acme_wildcard is True: elif acme_wildcard is True:
Log.info(self, "Certificate type : wildcard")
acme_domains = acme_domains + ['{0}'.format(wo_domain), acme_domains = acme_domains + ['{0}'.format(wo_domain),
'*.{0}'.format(wo_domain)] '*.{0}'.format(wo_domain)]
else: else:
Log.info(self, "Certificate type : domain")
acme_domains = acme_domains + ['{0}'.format(wo_domain), acme_domains = acme_domains + ['{0}'.format(wo_domain),
'www.{0}'.format(wo_domain)] 'www.{0}'.format(wo_domain)]

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

@@ -1594,7 +1594,7 @@ def setuprocketchat(self):
if ((not WOVariables.wo_platform_codename == 'bionic') and if ((not WOVariables.wo_platform_codename == 'bionic') and
(not WOVariables.wo_platform_codename == 'xenial')): (not WOVariables.wo_platform_codename == 'xenial')):
Log.info(self, "Rocket.chat is only available on Ubuntu 16.04 " Log.info(self, "Rocket.chat is only available on Ubuntu 16.04 "
"& 18.04 LTS") "& 18.04 LTS")
return False return False
else: else:
if not WOAptGet.is_installed(self, 'snapd'): if not WOAptGet.is_installed(self, 'snapd'):