diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index 7413013..9d1c145 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -1162,6 +1162,12 @@ class WOSiteUpdateController(CementBaseController): currsitetype=oldsitetype, currcachetype=oldcachetype, 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: Log.error(self, "Cannot update {0}, Invalid Options" @@ -1328,12 +1334,12 @@ class WOSiteUpdateController(CementBaseController): return 0 if pargs.hsts: - if pargs.hsts == 'on': + if data['hsts'] is True: if os.path.isfile(("{0}/conf/nginx/ssl.conf") .format(wo_site_webroot)): if (not os.path.isfile("{0}/conf/nginx/hsts.conf" .format(wo_site_webroot))): - setupHsts(self, wo_domain, True) + setupHsts(self, wo_domain) else: Log.error(self, "HSTS is already configured for given " "site") @@ -1345,7 +1351,7 @@ class WOSiteUpdateController(CementBaseController): "site") return 0 - elif pargs.hsts == 'off': + elif data['hsts'] is False: if os.path.isfile(("{0}/conf/nginx/hsts.conf") .format(wo_site_webroot)): WOFileUtils.mvfile(self, "{0}/conf/nginx/hsts.conf" diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index f202acb..818e23e 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1453,13 +1453,13 @@ def renewLetsEncrypt(self, wo_domain_name): # redirect= False to disable https redirection -def setupHsts(self, wo_domain, hsts=True): +def setupHsts(self, wo_domain_name): Log.info( 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" - .format(wo_domain), + .format(wo_domain_name), encoding='utf-8', mode='w') hstsconf.write("more_set_headers " "\"Strict-Transport-Security: "