From abff3e14f810f2a04099f7e9e48e2de7eafcb4cd Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 2 Oct 2019 16:33:40 +0200 Subject: [PATCH] Fix Cache enabler message --- wo/cli/plugins/site.py | 8 ++++---- wo/cli/plugins/site_functions.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index ab4e12c..e990a0d 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -437,6 +437,8 @@ class WOSiteCreateController(CementBaseController): pargs.site_name = pargs.site_name.strip() wo_domain = WODomain.validate(self, pargs.site_name) wo_www_domain = "www.{0}".format(wo_domain) + (wo_domain_type, wo_root_domain) = WODomain.getlevel( + self, wo_domain) if not wo_domain.strip(): Log.error(self, "Invalid domain name, " "Provide valid domain name") @@ -730,8 +732,6 @@ class WOSiteCreateController(CementBaseController): if pargs.letsencrypt: acme_domains = [] - (wo_domain_type, wo_root_domain) = WODomain.getlevel( - self, wo_domain) data['letsencrypt'] = True letsencrypt = True if WOAcme.cert_check(self, wo_domain): @@ -992,6 +992,8 @@ class WOSiteUpdateController(CementBaseController): pargs.site_name = pargs.site_name.strip() wo_domain = WODomain.validate(self, pargs.site_name) wo_www_domain = "www.{0}".format(wo_domain) + (wo_domain_type, wo_root_domain) = WODomain.getlevel( + self, wo_domain) wo_site_webroot = WOVar.wo_webroot + wo_domain check_site = getSiteInfo(self, wo_domain) @@ -1240,8 +1242,6 @@ class WOSiteUpdateController(CementBaseController): acme_domains = [] acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf', dnsalias=False, acme_alias='', keylength='') - (wo_domain_type, wo_root_domain) = WODomain.getlevel( - self, wo_domain) acmedata['keylength'] = self.app.config.get('letsencrypt', 'keylength') if pargs.letsencrypt == 'on': diff --git a/wo/cli/plugins/site_functions.py b/wo/cli/plugins/site_functions.py index 472bcfa..f6db964 100644 --- a/wo/cli/plugins/site_functions.py +++ b/wo/cli/plugins/site_functions.py @@ -1039,11 +1039,11 @@ def display_cache_settings(self, data): if data['wpce']: if data['multisite']: - Log.info(self, "Nginx-Helper configuration :" + Log.info(self, "Cache-Enabler configuration :" "\thttp://{0}/wp-admin/network/settings.php?" "page=cache-enabler".format(data['site_name'])) else: - Log.info(self, "Nginx-Helper configuration :" + Log.info(self, "Cache-Enabler configuration :" "\thttp://{0}/wp-admin/options-general.php?" "page=cache-enabler".format(data['site_name']))