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

add variable for hsts

Browse Source
This commit is contained in:
VirtuBox
2019-04-15 16:00:26 +02:00
parent 992e4f9aaa
commit cf97f18a15
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1162,6 +1162,12 @@ class WOSiteUpdateController(CementBaseController):
currsitetype=oldsitetype, currsitetype=oldsitetype,
currcachetype=oldcachetype, currcachetype=oldcachetype,
webroot=wo_site_webroot) webroot=wo_site_webroot)
if pargs.hsts == "on":
data['hsts'] = True
hsts = True
elif pargs.hsts == "off":
data['hsts'] = False
hsts = False
if not data: if not data:
Log.error(self, "Cannot update {0}, Invalid Options" Log.error(self, "Cannot update {0}, Invalid Options"
@@ -1328,12 +1334,12 @@ class WOSiteUpdateController(CementBaseController):
return 0 return 0
if pargs.hsts: if pargs.hsts:
if pargs.hsts == 'on': if data['hsts'] is True:
if os.path.isfile(("{0}/conf/nginx/ssl.conf") if os.path.isfile(("{0}/conf/nginx/ssl.conf")
.format(wo_site_webroot)): .format(wo_site_webroot)):
if (not os.path.isfile("{0}/conf/nginx/hsts.conf" if (not os.path.isfile("{0}/conf/nginx/hsts.conf"
.format(wo_site_webroot))): .format(wo_site_webroot))):
setupHsts(self, wo_domain, True) setupHsts(self, wo_domain)
else: else:
Log.error(self, "HSTS is already configured for given " Log.error(self, "HSTS is already configured for given "
"site") "site")
@@ -1345,7 +1351,7 @@ class WOSiteUpdateController(CementBaseController):
"site") "site")
return 0 return 0
elif pargs.hsts == 'off': elif data['hsts'] is False:
if os.path.isfile(("{0}/conf/nginx/hsts.conf") if os.path.isfile(("{0}/conf/nginx/hsts.conf")
.format(wo_site_webroot)): .format(wo_site_webroot)):
WOFileUtils.mvfile(self, "{0}/conf/nginx/hsts.conf" WOFileUtils.mvfile(self, "{0}/conf/nginx/hsts.conf"

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

@@ -1453,13 +1453,13 @@ def renewLetsEncrypt(self, wo_domain_name):
# redirect= False to disable https redirection # redirect= False to disable https redirection
def setupHsts(self, wo_domain, hsts=True): def setupHsts(self, wo_domain_name):
Log.info( Log.info(
self, "Adding /var/www/{0}/conf/nginx/hsts.conf" self, "Adding /var/www/{0}/conf/nginx/hsts.conf"
.format(wo_domain)) .format(wo_domain_name))
hstsconf = open("/var/www/{0}/conf/nginx/hsts.conf" hstsconf = open("/var/www/{0}/conf/nginx/hsts.conf"
.format(wo_domain), .format(wo_domain_name),
encoding='utf-8', mode='w') encoding='utf-8', mode='w')
hstsconf.write("more_set_headers " hstsconf.write("more_set_headers "
"\"Strict-Transport-Security: " "\"Strict-Transport-Security: "