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

Copy the certificate from wildcard if available

Browse Source
This commit is contained in:
VirtuBox
2019-08-30 06:08:54 +02:00
parent 51b698988e
commit 79469e90ad
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -760,9 +760,19 @@ class WOSiteCreateController(CementBaseController):
if ((wo_domain_type == 'subdomain') and
(not pargs.letsencrypt == 'wildcard')):
wo_subdomain = True
setupLetsEncrypt(self, wo_domain, wo_subdomain, wo_wildcard,
wo_dns, wo_acme_dns)
# check if a wildcard cert for the root domain exist
if wo_subdomain is True:
wo_exist_wildcard = checkWildcardExist(self,
wo_root_domain)
# copy the cert from the root domain
if wo_exist_wildcard is True:
copyWildcardCert(self, wo_domain, wo_root_domain)
else:
setupLetsEncrypt(self, wo_domain, wo_subdomain,
wo_wildcard, wo_dns, wo_acme_dns)
else:
setupLetsEncrypt(self, wo_domain, wo_subdomain,
wo_wildcard, wo_dns, wo_acme_dns)
httpsRedirect(self, wo_domain, True, wo_wildcard)
if pargs.hsts:

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

@@ -1488,6 +1488,27 @@ def checkWildcardExist(self, wo_domain_name):
Log.debug(self, "{0}".format(e))
Log.error(self, "Failed to read cert list")
# copy wildcard certificate to a subdomain
def copyWildcardCert(self, wo_domain_name, wo_root_domain):
if os.path.isfile("/var/www/{0}/conf/nginx/ssl.conf"
.format(wo_root_domain)):
try:
WOFileUtils.copyfile(self, "/var/www/{0}/conf/nginx/ssl.conf"
.format(wo_root_domain),
"/var/www/{0}/conf/nginx/ssl.conf"
.format(wo_domain_name))
cert_link = open('/var/lib/wo/linked.csv', encoding='utf-8',
mode='a')
cert_link.write('{0}|{1}\n'.format(wo_root_domain,
wo_domain_name))
cert_link.close()
except IOError as e:
Log.debug(self, str(e))
Log.debug(self, "Error occured while copying ssl cert")
# letsencrypt cert renewal