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

simplify cert

Browse Source
This commit is contained in:
VirtuBox
2019-08-30 07:58:00 +02:00
parent 2d1c17648e
commit 6c70ba7824
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -424,7 +424,7 @@ class WOSiteCreateController(CementBaseController):
pargs.site_name = pargs.site_name.strip() pargs.site_name = pargs.site_name.strip()
(wo_domain, wo_www_domain) = ValidateDomain(pargs.site_name) (wo_domain, wo_www_domain) = ValidateDomain(pargs.site_name)
wo_domain_type, wo_root_domain = GetDomainlevel(wo_domain) (wo_domain_type, wo_root_domain) = GetDomainlevel(wo_domain)
if not wo_domain.strip(): if not wo_domain.strip():
Log.error("Invalid domain name, " Log.error("Invalid domain name, "
"Provide valid domain name") "Provide valid domain name")
@@ -760,12 +760,9 @@ class WOSiteCreateController(CementBaseController):
if ((wo_domain_type == 'subdomain') and if ((wo_domain_type == 'subdomain') and
(not pargs.letsencrypt == 'wildcard')): (not pargs.letsencrypt == 'wildcard')):
wo_subdomain = True wo_subdomain = True
# check if a wildcard cert for the root domain exist # check if a wildcard cert for the root domain exist
if wo_subdomain is True: if checkWildcardExist(self, wo_root_domain):
wo_exist_wildcard = checkWildcardExist(self, # copy the cert from the root domain
wo_root_domain)
# copy the cert from the root domain
if wo_exist_wildcard is True:
copyWildcardCert(self, wo_domain, wo_root_domain) copyWildcardCert(self, wo_domain, wo_root_domain)
else: else:
setupLetsEncrypt(self, wo_domain, wo_subdomain, setupLetsEncrypt(self, wo_domain, wo_subdomain,