From 7f0bdb987903be71678c91de072b955d64696f6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20M=C3=BChl?= Date: Fri, 11 Dec 2015 12:18:13 +0700 Subject: [PATCH 1/2] Update ee.8 updated the path to ee.conf file --- docs/ee.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ee.8 b/docs/ee.8 index 7b5d0658..e07f793f 100644 --- a/docs/ee.8 +++ b/docs/ee.8 @@ -287,7 +287,7 @@ Install, activate, configure Nginx-helper and Redis Object Cache Plugin, Configu Install, activate Nginx-helper and configure NGINX for HHVM. .SH FILES .br -/etc/easyengine/ee.conf +/etc/ee/ee.conf .SH BUGS Report bugs at .SH AUTHOR From 68223aafff5047c4ed703cde2c781da1b237ad48 Mon Sep 17 00:00:00 2001 From: "nikhilc@bsf.io" Date: Tue, 2 Feb 2016 20:07:26 +0530 Subject: [PATCH 2/2] updated the WordPress rademark in some strings --- ee/cli/plugins/site_functions.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 38232fca..95d5a94f 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -250,7 +250,7 @@ def setupwordpress(self, data): if 'wp-pass' in data.keys() and data['wp-pass']: ee_wp_pass = data['wp-pass'] - Log.info(self, "Downloading Wordpress \t\t", end='') + Log.info(self, "Downloading WordPress \t\t", end='') EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot)) try: if EEShellExec.cmd_exec(self, "wp --allow-root core" @@ -258,10 +258,10 @@ def setupwordpress(self, data): pass else: Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]") - raise SiteError("download wordpress core failed") + raise SiteError("download WordPress core failed") except CommandExecutionError as e: Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]") - raise SiteError(self, "download wordpress core failed") + raise SiteError(self, "download WordPress core failed") Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") @@ -389,7 +389,7 @@ def setupwordpress(self, data): ee_wp_user = input('Enter WordPress username: ') except EOFError as e: Log.debug(self, "{0}".format(e)) - raise SiteError("input wordpress username failed") + raise SiteError("input WordPress username failed") if not ee_wp_pass: ee_wp_pass = ee_random @@ -400,7 +400,7 @@ def setupwordpress(self, data): ee_wp_email = input('Enter WordPress email: ') except EOFError as e: Log.debug(self, "{0}".format(e)) - raise SiteError("input wordpress username failed") + raise SiteError("input WordPress username failed") try: while not re.match(r"^[A-Za-z0-9\.\+_-]+@[A-Za-z0-9\._-]+\.[a-zA-Z]*$", @@ -434,9 +434,9 @@ def setupwordpress(self, data): log=False): pass else: - raise SiteError("setup wordpress tables failed for single site") + raise SiteError("setup WordPress tables failed for single site") except CommandExecutionError as e: - raise SiteError("setup wordpress tables failed for single site") + raise SiteError("setup WordPress tables failed for single site") else: Log.debug(self, "Creating tables for WordPress multisite") Log.debug(self, "php {0} --allow-root " @@ -465,9 +465,9 @@ def setupwordpress(self, data): log=False): pass else: - raise SiteError("setup wordpress tables failed for wp multi site") + raise SiteError("setup WordPress tables failed for wp multi site") except CommandExecutionError as e: - raise SiteError("setup wordpress tables failed for wp multi site") + raise SiteError("setup WordPress tables failed for wp multi site") Log.debug(self, "Updating WordPress permalink") try: @@ -518,11 +518,11 @@ def setupwordpressnetwork(self, data): pass else: Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]") - raise SiteError("setup wordpress network failed") + raise SiteError("setup WordPress network failed") except CommandExecutionError as e: Log.info(self, "[" + Log.ENDC + Log.FAIL + "Fail" + Log.OKBLUE + "]") - raise SiteError("setup wordpress network failed") + raise SiteError("setup WordPress network failed") Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") @@ -852,7 +852,7 @@ def updatewpuserpassword(self, ee_domain, ee_site_webroot): is_wp = EEShellExec.cmd_exec(self, "wp --allow-root core" " version") except CommandExecutionError as e: - raise SiteError("is wordpress site? check command failed ") + raise SiteError("is WordPress site? check command failed ") # Exit if ee_domain is not wordpress install if not is_wp: @@ -1207,7 +1207,7 @@ def setupLetsEncrypt(self, ee_domain_name): ee_wp_email = input('Enter WordPress email: ') except EOFError as e: Log.debug(self, "{0}".format(e)) - raise SiteError("input wordpress username failed") + raise SiteError("input WordPress username failed") if not os.path.isdir("/opt/letsencrypt"): cloneLetsEncrypt(self) @@ -1265,7 +1265,7 @@ def renewLetsEncrypt(self, ee_domain_name): ee_wp_email = input('Enter email address: ') except EOFError as e: Log.debug(self, "{0}".format(e)) - raise SiteError("Input wordpress email failed") + raise SiteError("Input WordPress email failed") if not os.path.isdir("/opt/letsencrypt"): cloneLetsEncrypt(self)