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

fix hsts

Browse Source
This commit is contained in:
VirtuBox
2019-04-15 15:09:10 +02:00
parent ce50ee30a4
commit 8282ff0aaa
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,7 +888,8 @@ class WOSiteUpdateController(CementBaseController):
if (pargs.password and not (pargs.html or
pargs.php or pargs.php73 or pargs.mysql or
pargs.wp or pargs.wpfc or pargs.wpsc or
pargs.wpsubdir or pargs.wpsubdomain)):
pargs.wpsubdir or pargs.wpsubdomain or
pargs.hsts)):
try:
updatewpuserpassword(self, wo_domain, wo_site_webroot)
except SiteError as e:
@@ -1320,16 +1321,13 @@ class WOSiteUpdateController(CementBaseController):
if pargs.hsts:
if os.path.isfile(("{0}/conf/nginx/ssl.conf")
.format(wo_site_webroot)):
if (not os.path.isfile("{0}/conf/nginx/hsts.conf.disabled"
if (not os.path.isfile("{0}/conf/nginx/hsts.conf"
.format(wo_site_webroot))):
setupHsts(self, wo_domain)
setupHsts(self, wo_domain, True)
else:
WOFileUtils.mvfile(self, "{0}/conf/nginx/"
"hsts.conf.disabled"
.format(wo_site_webroot),
'{0}/conf/nginx/hsts.conf'
.format(wo_site_webroot))
Log.error(self, "HSTS is already configured for given "
"site")
if not WOService.reload_service(self, 'nginx'):
Log.error(self, "service nginx reload failed. "
"check issues with `nginx -t` command")