From e2a952866d0b49a987cfdabb12d0d9b730a85721 Mon Sep 17 00:00:00 2001 From: "shital.rtcamp" Date: Tue, 3 Feb 2015 18:06:55 +0530 Subject: [PATCH 1/5] changed log.info message in site_function.py --- ee/cli/plugins/site_functions.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 0886f6a2..a8851a60 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -279,12 +279,12 @@ def setupwordpress(self, data): def setupwordpressnetwork(self, data): ee_site_webroot = data['webroot'] EEFileUtils.chdir(self, '{0}/htdocs/'.format(ee_site_webroot)) - Log.info(self, "Setting up WordPress Network \t\t", end='') + Log.info(self, "Setting up WordPress Network \t", end='') EEShellExec.cmd_exec(self, 'wp --allow-root core multisite-convert' ' --title={0} {subdomains}' .format(data['www_domain'], subdomains='--subdomains' if not data['wpsubdir'] else '')) - Log.info(self, "Done") + Log.info(self, "[" + Log.ENDC + "Done" + Log.OKBLUE + "]") def installwp_plugin(self, plugin_name, data): From db350dfa204244e7f1079f5fa6f208710d0a7d88 Mon Sep 17 00:00:00 2001 From: "shital.rtcamp" Date: Tue, 3 Feb 2015 19:41:57 +0530 Subject: [PATCH 2/5] modified log message in services.py --- ee/core/services.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/core/services.py b/ee/core/services.py index 392c7d56..13b30ce7 100644 --- a/ee/core/services.py +++ b/ee/core/services.py @@ -99,7 +99,7 @@ class EEService(): Log.info(self, "[" + Log.FAIL + "Failed" + Log.OKBLUE+"]") return False - Log.info(self, "Reload : {0:10}".format(service_name), end='') + Log.info(self, "Reload : {0:10}".format(service_name), end='') retcode = subprocess.getstatusoutput('service {0} reload' .format(service_name)) if retcode[0] == 0: From 6c4982b70834b53d6ef6c1e7cd6d22d71ef4dc2d Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Tue, 3 Feb 2015 19:54:15 +0530 Subject: [PATCH 3/5] changed ee version --- ee/core/variables.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index e3d03117..3cd58bdf 100644 --- a/ee/core/variables.py +++ b/ee/core/variables.py @@ -12,7 +12,7 @@ class EEVariables(): """Intialization of core variables""" # EasyEngine version - ee_version = "3.0.0" + ee_version = "3.0.0-beta" # EasyEngine packages versions ee_wp_cli = "0.18.0" From 3bd7cb203943a1c779b6033ee8efd58a0b80e974 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Tue, 3 Feb 2015 20:20:30 +0530 Subject: [PATCH 4/5] changed README.md file --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 56237fd1..a119d9bf 100644 --- a/README.md +++ b/README.md @@ -19,20 +19,22 @@ EasyEngine (ee) is a linux shell-script collection, which makes it easy to manag - Ubuntu 12.04 & 14.04 - Debian 7 +### This is Beta version. Donot Try on Production/Live servers + ## Quick Start ```bash -wget -qO ee rt.cx/ee && sudo bash ee # install easyengine +wget http://rt.cx/eebeta && sudo bash install # install easyengine 3.0.0-beta sudo ee site create example.com --wp # Install required packages & setup WordPress on example.com ``` ## Update EasyEngine -Update Procedure For EasyEngine +Update Procedure For EasyEngine to version 3.0.0-beta ```bash -wget -qO eeup http://rt.cx/eeup && sudo bash eeup +wget http://rt.cx/eebeta && sudo bash install ``` ## More Site Creation Commands From 21ecee5a3a38142184990c37539cda6a3437a3f9 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Wed, 4 Feb 2015 15:01:57 +0530 Subject: [PATCH 5/5] Autofix database user name --- ee/cli/plugins/site_functions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index a8851a60..d9b2e83c 100644 --- a/ee/cli/plugins/site_functions.py +++ b/ee/cli/plugins/site_functions.py @@ -106,8 +106,7 @@ def setupdatabase(self, data): ' please wait') ee_random10 = (''.join(random.sample(string.ascii_uppercase + string.ascii_lowercase + string.digits, 10))) - ee_db_name = (ee_db_name[0:6] + ee_random10) - + ee_db_username = (ee_db_name[0:6] + ee_random10) # create MySQL database Log.info(self, "Setting up database\t\t", end='') Log.debug(self, "Creating databse {0}".format(ee_db_name))