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

Update bash-completion and add wildcard redirection

Browse Source
This commit is contained in:
VirtuBox
2019-07-14 01:07:34 +02:00
parent 2657af9abb
commit b7e7da0d2f
3 changed files with 1802 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -737,12 +737,14 @@ class WOSiteCreateController(CementBaseController):
if data['letsencrypt'] is True:
if self.app.pargs.letsencrypt == "on":
setupLetsEncrypt(self, wo_domain)
httpsRedirect(self, wo_domain)
elif self.app.pargs.letsencrypt == "subodmain":
setupLetsEncryptSubdomain(self, wo_domain)
httpsRedirect(self, wo_domain)
elif self.app.pargs.letsencrypt == "wildcard":
setupLetsEncryptWildcard(self, wo_domain)
httpsRedirect(self, wo_domain, True, True)
httpsRedirect(self, wo_domain)
if self.app.pargs.hsts:
setupHsts(self, wo_domain)
@@ -1269,18 +1271,19 @@ class WOSiteUpdateController(CementBaseController):
.format(wo_site_webroot)):
if self.app.pargs.letsencrypt == "on":
setupLetsEncrypt(self, wo_domain)
httpsRedirect(self, wo_domain)
elif self.app.pargs.letsencrypt == "subodmain":
setupLetsEncryptSubdomain(self, wo_domain)
httpsRedirect(self, wo_domain)
elif self.app.pargs.letsencrypt == "wildcard":
setupLetsEncryptWildcard(self, wo_domain, dns_cf)
httpsRedirect(self, wo_domain, True, True)
else:
WOFileUtils.mvfile(self, "{0}/conf/nginx/ssl.conf.disabled"
.format(wo_site_webroot),
'{0}/conf/nginx/ssl.conf'
.format(wo_site_webroot))
httpsRedirect(self, wo_domain)
if not WOService.reload_service(self, 'nginx'):
Log.error(self, "service nginx reload failed. "
"check issues with `nginx -t` command")

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

File diff suppressed because it is too large Load Diff