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

Refactor letsencrypt stack

Browse Source
This commit is contained in:
VirtuBox
2019-08-27 23:25:39 +02:00
parent b504842550
commit 54a17e796f
1 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -769,27 +769,29 @@ class WOSiteCreateController(CementBaseController):
if pargs.letsencrypt: if pargs.letsencrypt:
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True
if pargs.dns:
wo_acme_dns = pargs.dns
if data['letsencrypt'] is True: if data['letsencrypt'] is True:
if pargs.letsencrypt == "subdomain": if (wo_domain_type == 'subdomain' and
if pargs.dns: (not pargs.letsencrypt == 'wildcard')):
setupLetsEncrypt(self, wo_domain, True, False, pargs.letsencrypt == 'subdomain'
True, wo_acme_dns) if pargs.dns:
else: wo_acme_dns = pargs.dns
setupLetsEncrypt(self, wo_domain, True) wo_dns = True
httpsRedirect(self, wo_domain)
elif pargs.letsencrypt == "wildcard":
setupLetsEncrypt(self, wo_domain, False, True,
True, wo_acme_dns)
httpsRedirect(self, wo_domain, True, True)
else: else:
if pargs.dns: wo_acme_dns = ''
setupLetsEncrypt(self, wo_domain, False, wo_dns = False
False, True, wo_acme_dns) if pargs.letsencrypt == "subdomain":
else: wo_subdomain = True
setupLetsEncrypt(self, wo_domain) wo_wildcard = False
httpsRedirect(self, wo_domain) elif pargs.letsencrypt == "wildcard":
wo_wildcard = True
wo_subdomain = False
else:
wo_wildcard = False
wo_subdomain = False
setupLetsEncrypt(self, wo_domain, wo_subdomain, wo_wildcard,
wo_dns, wo_acme_dns)
httpsRedirect(self, wo_domain, True, wo_wildcard)
if pargs.hsts: if pargs.hsts:
setupHsts(self, wo_domain) setupHsts(self, wo_domain)
@@ -951,7 +953,7 @@ class WOSiteUpdateController(CementBaseController):
try: try:
while not pargs.site_name: while not pargs.site_name:
pargs.site_name = (input('Enter site name : ').strip()) pargs.site_name = (input('Enter site name : ').strip())
except IOError as e: except IOError:
Log.error(self, 'Unable to input site name, Please try again!') Log.error(self, 'Unable to input site name, Please try again!')
pargs.site_name = pargs.site_name.strip() pargs.site_name = pargs.site_name.strip()
@@ -1239,24 +1241,42 @@ class WOSiteUpdateController(CementBaseController):
return 0 return 0
if pargs.letsencrypt: if pargs.letsencrypt:
if ((wo_domain_type == 'subdomain') and
(not pargs.letsencrypt == 'wildcard') and
(not pargs.letsencrypt == 'off') and
(not pargs.letsencrypt == 'clean') and
(not pargs.letsencrypt == 'purge')):
pargs.letsencrypt == 'subdomain'
if pargs.letsencrypt == 'on': if pargs.letsencrypt == 'on':
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True
wo_wildcard = False
wo_subdomain = False
elif pargs.letsencrypt == 'subdomain': elif pargs.letsencrypt == 'subdomain':
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True
wo_subdomain = True
wo_wildcard = False
elif pargs.letsencrypt == 'wildcard': elif pargs.letsencrypt == 'wildcard':
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True
wo_wildcard = True
wo_subdomain = False
elif pargs.letsencrypt == 'off': elif pargs.letsencrypt == 'off':
data['letsencrypt'] = False data['letsencrypt'] = False
letsencrypt = False letsencrypt = False
wo_subdomain = False
wo_wildcard = False
elif pargs.letsencrypt == 'clean': elif pargs.letsencrypt == 'clean':
data['letsencrypt'] = False data['letsencrypt'] = False
letsencrypt = False letsencrypt = False
wo_subdomain = False
wo_wildcard = False
elif pargs.letsencrypt == 'purge': elif pargs.letsencrypt == 'purge':
data['letsencrypt'] = False data['letsencrypt'] = False
letsencrypt = False letsencrypt = False
wo_subdomain = False
wo_wildcard = False
if letsencrypt is check_ssl: if letsencrypt is check_ssl:
if letsencrypt is False: if letsencrypt is False:
@@ -1351,38 +1371,31 @@ class WOSiteUpdateController(CementBaseController):
return 0 return 0
if pargs.letsencrypt: if pargs.letsencrypt:
if pargs.dns:
wo_acme_dns = pargs.dns
if data['letsencrypt'] is True: if data['letsencrypt'] is True:
if (wo_domain_type == 'subdomain' and if pargs.dns:
pargs.letsencrypt != 'wildcard'): wo_acme_dns = pargs.dns
pargs.letsencrypt == 'subdomain' wo_dns = True
if not os.path.isfile("{0}/conf/nginx/ssl.conf.disabled" else:
.format(wo_site_webroot)): wo_acme_dns = ''
if pargs.letsencrypt == "on": wo_dns = False
if pargs.dns: if not os.path.isfile("{0}/conf/nginx/ssl.conf.disabled"):
setupLetsEncrypt(self, wo_domain, False, setupLetsEncrypt(self, wo_domain, wo_subdomain,
False, True, wo_acme_dns) wo_wildcard,
else: wo_dns, wo_acme_dns)
setupLetsEncrypt(self, wo_domain) httpsRedirect(self, wo_domain, True, wo_wildcard)
httpsRedirect(self, wo_domain)
elif pargs.letsencrypt == "subdomain":
if pargs.dns:
setupLetsEncrypt(self, wo_domain, True, False,
True, wo_acme_dns)
else:
setupLetsEncrypt(self, wo_domain, True)
httpsRedirect(self, wo_domain)
elif pargs.letsencrypt == "wildcard":
setupLetsEncrypt(self, wo_domain, False, True,
True, wo_acme_dns)
httpsRedirect(self, wo_domain, True, True)
site_url_https(self, wo_domain) site_url_https(self, wo_domain)
else: else:
WOFileUtils.mvfile(self, "{0}/conf/nginx/ssl.conf.disabled" WOFileUtils.mvfile(self, "{0}/conf/nginx/ssl.conf.disabled"
.format(wo_site_webroot), .format(wo_site_webroot),
'{0}/conf/nginx/ssl.conf' '{0}/conf/nginx/ssl.conf'
.format(wo_site_webroot)) .format(wo_site_webroot))
WOFileUtils.mvfile(self, "/etc/nginx/conf.d/"
"force-ssl-{0}.conf.disabled"
.format(wo_domain),
'/etc/nginx/conf.d/force-ssl-{0}.conf'
.format(wo_domain))
httpsRedirect(self, wo_domain, True, wo_wildcard)
site_url_https(self, wo_domain) site_url_https(self, wo_domain)
if not WOService.reload_service(self, 'nginx'): if not WOService.reload_service(self, 'nginx'):