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

Move setuphsts into sslutils

Browse Source
This commit is contained in:
VirtuBox
2019-09-06 22:21:16 +02:00
parent 0cc32a8565
commit e444886c52
5 changed files with 57 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -768,7 +768,7 @@ class WOSiteCreateController(CementBaseController):
httpsRedirect(self, wo_domain, True, wo_wildcard)
if pargs.hsts:
setupHsts(self, wo_domain)
SSL.setuphsts(self, wo_domain)
SSL.siteurlhttps(self, wo_domain)
if not WOService.reload_service(self, 'nginx'):
@@ -969,7 +969,7 @@ class WOSiteUpdateController(CementBaseController):
pargs.wpsubdir or pargs.wpsubdomain or
pargs.password)):
try:
setupHsts(self, wo_domain)
SSL.setuphsts(self, wo_domain)
except SiteError as e:
Log.debug(self, str(e))
Log.info(self, "\nFail to enable HSTS")
@@ -1474,7 +1474,7 @@ class WOSiteUpdateController(CementBaseController):
.format(wo_site_webroot)):
if not os.path.isfile("{0}/conf/nginx/hsts.conf"
.format(wo_site_webroot)):
setupHsts(self, wo_domain)
SSL.setuphsts(self, wo_domain)
else:
Log.error(self, "HSTS is already configured for given "
"site")