Merge tag 'v3.3.9' into develop

Easyengine v3.3.9

CHANGELOG.txt

@@ -1,3 +1,8 @@
+v 3.3.9 - Oct 9, 2015
+- Fix #625
+- Fix #627
+- Fix phpmyadmin for remote mysql server
+
 v 3.3.8 - Sep 9, 2015
 - # Fix White screen for NGINX PLUS users
 

README.md

@@ -11,11 +11,14 @@ EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress s
 - Debian 7 & 8
 
 **Port Requirements:**
-- 22/TCP (Inbound/Outbound) : Standard SSH port
-- 80/TCP (Inbound/Outbound) : Standard HTTP port
-- 443/TCP(Inbound/Outbound) : Standard HTTPS port
-- 22222/TCP (Inbound)       : To access EasyEngine admin tools
-- 11371/TCP (Outbound)      : To connect to GPG Key Server
+
+| Name  | Port Number | Inbound | Outbound  |
+|:-----:|:-----------:|:-------:|:---------:|
+|SSH    |22           | ✓       |✓          |
+|HTTP    |80           | ✓       |✓          |
+|HTTPS/SSL    |443           | ✓       |✓          |
+|EE Admin    |2222           | ✓       |          |
+|GPG Key Server    |11371           |        |✓          |
 
 ## Quick Start
 

ee/cli/plugins/site.py

@@ -655,7 +655,7 @@ class EESiteCreateController(CementBaseController):
                                     webroot=data['webroot'],
                                     dbname=data['ee_db_name'],
                                     dbuser=data['ee_db_user'],
-                                    dbhost=data['ee_db_host'])
+                                    dbhost=data['ee_mysql_grant_host'])
                     deleteSiteInfo(self, ee_domain)
                     Log.error(self, "Check logs for reason "
                               "`tail /var/log/ee/ee.log` & Try Again!!!")
@@ -670,7 +670,7 @@ class EESiteCreateController(CementBaseController):
                     doCleanupAction(self, domain=ee_domain,
                                     dbname=data['ee_db_name'],
                                     dbuser=data['ee_db_user'],
-                                    dbhost=data['ee_db_host'])
+                                    dbhost=data['ee_mysql_grant_host'])
                 deleteSiteInfo(self, ee_domain)
                 Log.info(self, Log.FAIL + "service nginx reload failed."
                          " check issues with `nginx -t` command.")
@@ -694,7 +694,7 @@ class EESiteCreateController(CementBaseController):
                     doCleanupAction(self, domain=ee_domain,
                                     dbname=data['ee_db_name'],
                                     dbuser=data['ee_db_user'],
-                                    dbhost=data['ee_db_host'])
+                                    dbhost=data['ee_mysql_grant_host'])
                 deleteSiteInfo(self, ee_domain)
                 Log.error(self, "Check logs for reason "
                           "`tail /var/log/ee/ee.log` & Try Again!!!")
@@ -1433,7 +1433,7 @@ class EESiteDeleteController(CementBaseController):
         if ee_site_type in ['mysql', 'wp', 'wpsubdir', 'wpsubdomain']:
             ee_db_name = check_site.db_name
             ee_db_user = check_site.db_user
-            ee_db_host = check_site.db_host
+            ee_mysql_grant_host = self.app.config.get('mysql', 'grant-host')
             if ee_db_name == 'deleted':
                 mark_db_deleted = True
             if self.app.pargs.all:
@@ -1458,7 +1458,7 @@ class EESiteDeleteController(CementBaseController):
                     mark_db_delete_prompt = True
                     Log.info(self, "Deleting Database, {0}, user {1}"
                              .format(ee_db_name, ee_db_user))
-                    deleteDB(self, ee_db_name, ee_db_user, ee_db_host, False)
+                    deleteDB(self, ee_db_name, ee_db_user, ee_mysql_grant_host, False)
                     updateSiteInfo(self, ee_domain,
                                    db_name='deleted',
                                    db_user='deleted',

ee/cli/plugins/site_functions.py

@@ -223,6 +223,7 @@ def setupdatabase(self, data):
     data['ee_db_user'] = ee_db_username
     data['ee_db_pass'] = ee_db_password
     data['ee_db_host'] = EEVariables.ee_mysql_host
+    data['ee_mysql_grant_host'] = ee_mysql_grant_host
     return(data)
 
 

ee/cli/plugins/stack.py

@@ -1105,7 +1105,7 @@ class EEStackController(CementBaseController):
                     for x in packages):
                 EEExtract.extract(self, '/tmp/pma.tar.gz', '/tmp/')
                 Log.debug(self, 'Extracting file /tmp/pma.tar.gz to '
-                          'loaction /tmp/')
+                          'location /tmp/')
                 if not os.path.exists('{0}22222/htdocs/db'
                                       .format(EEVariables.ee_webroot)):
                     Log.debug(self, "Creating new  directory "
@@ -1116,6 +1116,29 @@ class EEStackController(CementBaseController):
                 shutil.move('/tmp/phpmyadmin-STABLE/',
                             '{0}22222/htdocs/db/pma/'
                             .format(EEVariables.ee_webroot))
+                shutil.copyfile('{0}22222/htdocs/db/pma/config.sample.inc.php'
+                                .format(EEVariables.ee_webroot),
+                                '{0}22222/htdocs/db/pma/config.inc.php'
+                                .format(EEVariables.ee_webroot))
+                Log.debug(self, 'Setting Blowfish Secret Key FOR COOKIE AUTH to  '
+                          '{0}22222/htdocs/db/pma/config.inc.php file '
+                          .format(EEVariables.ee_webroot))
+                blowfish_key = ''.join([random.choice
+                         (string.ascii_letters + string.digits)
+                         for n in range(10)])
+                EEFileUtils.searchreplace(self,
+                                          '{0}22222/htdocs/db/pma/config.inc.php'
+                                          .format(EEVariables.ee_webroot),
+                                          "$cfg[\'blowfish_secret\'] = \'\';","$cfg[\'blowfish_secret\'] = \'{0}\';"
+                                          .format(blowfish_key))
+                Log.debug(self, 'Setting HOST Server For Mysql to  '
+                          '{0}22222/htdocs/db/pma/config.inc.php file '
+                          .format(EEVariables.ee_webroot))
+                EEFileUtils.searchreplace(self,
+                                          '{0}22222/htdocs/db/pma/config.inc.php'
+                                          .format(EEVariables.ee_webroot),
+                                          "$cfg[\'Servers\'][$i][\'host\'] = \'localhost\';","$cfg[\'Servers\'][$i][\'host\'] = \'{0}\';"
+                                          .format(EEVariables.ee_mysql_host))
                 Log.debug(self, 'Setting Privileges of webroot permission to  '
                           '{0}22222/htdocs/db/pma file '
                           .format(EEVariables.ee_webroot))

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.3.8"
+    ee_version = "3.3.9"
 
 
     # EasyEngine packages versions

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.3.8"
+readonly ee_version_new="3.3.9"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')

setup.py

@@ -54,7 +54,7 @@ except Exception as e:
     os.system("git config --global user.email {0}".format(ee_email))
 
 setup(name='ee',
-      version='3.3.8',
+      version='3.3.9',
       description=long_description,
       long_description=long_description,
       classifiers=[],