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

Fix site ssl status not updated

Browse Source
This commit is contained in:
VirtuBox
2020-01-18 18:43:58 +01:00
parent 0bd58ef7a7
commit 87e46d9145
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -614,8 +614,9 @@ class WOSiteUpdateController(CementBaseController):
'www.{0}'.format(wo_domain)] 'www.{0}'.format(wo_domain)]
if WOAcme.cert_check(self, wo_domain): if WOAcme.cert_check(self, wo_domain):
SSL.archivedcertificatehandle( if SSL.archivedcertificatehandle(
self, wo_domain, acme_domains) self, wo_domain, acme_domains):
letsencrypt = True
else: else:
if acme_subdomain: if acme_subdomain:
Log.debug(self, "checkWildcardExist on *.{0}" Log.debug(self, "checkWildcardExist on *.{0}"
@@ -676,6 +677,7 @@ class WOSiteUpdateController(CementBaseController):
"check issues with `nginx -t` command") "check issues with `nginx -t` command")
Log.info(self, "Congratulations! Successfully " Log.info(self, "Congratulations! Successfully "
"Configured SSL on https://{0}".format(wo_domain)) "Configured SSL on https://{0}".format(wo_domain))
letsencrypt = True
if (SSL.getexpirationdays(self, wo_domain) > 0): if (SSL.getexpirationdays(self, wo_domain) > 0):
Log.info(self, "Your cert will expire within " + Log.info(self, "Your cert will expire within " +
str(SSL.getexpirationdays(self, wo_domain)) + str(SSL.getexpirationdays(self, wo_domain)) +
@@ -725,8 +727,9 @@ class WOSiteUpdateController(CementBaseController):
# auto-renewal") WOCron.remove_cron(self,'wo site # auto-renewal") WOCron.remove_cron(self,'wo site
# update {0} --le=renew --min_expiry_limit 30 # update {0} --le=renew --min_expiry_limit 30
# 2> \/dev\/null'.format(wo_domain)) # 2> \/dev\/null'.format(wo_domain))
Log.info(self, "Successfully Disabled SSl for Site " Log.info(self, "Successfully Disabled SSl for Site "
" http://{0}".format(wo_domain)) " http://{0}".format(wo_domain))
letsencrypt = False
# Add nginx conf folder into GIT # Add nginx conf folder into GIT
WOGit.add(self, ["{0}/conf/nginx".format(wo_site_webroot)], WOGit.add(self, ["{0}/conf/nginx".format(wo_site_webroot)],