Merge branch 'python' of github.com:rtCamp/easyengine into python

Author: gau1991

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

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))
@@ -279,12 +278,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):

ee/core/services.py

@@ -99,7 +99,7 @@ def reload_service(self, service_name):
                     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:

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"