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

Fix Cache enabler message

Browse Source
This commit is contained in:
VirtuBox
2019-10-02 16:33:40 +02:00
parent fa4c7c04f6
commit abff3e14f8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -437,6 +437,8 @@ class WOSiteCreateController(CementBaseController):
pargs.site_name = pargs.site_name.strip() pargs.site_name = pargs.site_name.strip()
wo_domain = WODomain.validate(self, pargs.site_name) wo_domain = WODomain.validate(self, pargs.site_name)
wo_www_domain = "www.{0}".format(wo_domain) wo_www_domain = "www.{0}".format(wo_domain)
(wo_domain_type, wo_root_domain) = WODomain.getlevel(
self, wo_domain)
if not wo_domain.strip(): if not wo_domain.strip():
Log.error(self, "Invalid domain name, " Log.error(self, "Invalid domain name, "
"Provide valid domain name") "Provide valid domain name")
@@ -730,8 +732,6 @@ class WOSiteCreateController(CementBaseController):
if pargs.letsencrypt: if pargs.letsencrypt:
acme_domains = [] acme_domains = []
(wo_domain_type, wo_root_domain) = WODomain.getlevel(
self, wo_domain)
data['letsencrypt'] = True data['letsencrypt'] = True
letsencrypt = True letsencrypt = True
if WOAcme.cert_check(self, wo_domain): if WOAcme.cert_check(self, wo_domain):
@@ -992,6 +992,8 @@ class WOSiteUpdateController(CementBaseController):
pargs.site_name = pargs.site_name.strip() pargs.site_name = pargs.site_name.strip()
wo_domain = WODomain.validate(self, pargs.site_name) wo_domain = WODomain.validate(self, pargs.site_name)
wo_www_domain = "www.{0}".format(wo_domain) 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 wo_site_webroot = WOVar.wo_webroot + wo_domain
check_site = getSiteInfo(self, wo_domain) check_site = getSiteInfo(self, wo_domain)
@@ -1240,8 +1242,6 @@ class WOSiteUpdateController(CementBaseController):
acme_domains = [] acme_domains = []
acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf', acmedata = dict(acme_domains, dns=False, acme_dns='dns_cf',
dnsalias=False, acme_alias='', keylength='') dnsalias=False, acme_alias='', keylength='')
(wo_domain_type, wo_root_domain) = WODomain.getlevel(
self, wo_domain)
acmedata['keylength'] = self.app.config.get('letsencrypt', acmedata['keylength'] = self.app.config.get('letsencrypt',
'keylength') 'keylength')
if pargs.letsencrypt == 'on': if pargs.letsencrypt == 'on':

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

@@ -1039,11 +1039,11 @@ def display_cache_settings(self, data):
if data['wpce']: if data['wpce']:
if data['multisite']: if data['multisite']:
Log.info(self, "Nginx-Helper configuration :" Log.info(self, "Cache-Enabler configuration :"
"\thttp://{0}/wp-admin/network/settings.php?" "\thttp://{0}/wp-admin/network/settings.php?"
"page=cache-enabler".format(data['site_name'])) "page=cache-enabler".format(data['site_name']))
else: else:
Log.info(self, "Nginx-Helper configuration :" Log.info(self, "Cache-Enabler configuration :"
"\thttp://{0}/wp-admin/options-general.php?" "\thttp://{0}/wp-admin/options-general.php?"
"page=cache-enabler".format(data['site_name'])) "page=cache-enabler".format(data['site_name']))