From 4b199148bd00cc44a71910f3f9831e339658192b Mon Sep 17 00:00:00 2001 From: Mitesh Shah Date: Tue, 15 Sep 2015 16:01:51 +0530 Subject: [PATCH 01/11] Update README.md --- README.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dc06597d..711a23fd 100644 --- a/README.md +++ b/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 From e4d6b91c820f959aefd5a3ec6792bb72ca8f3bc0 Mon Sep 17 00:00:00 2001 From: prabuddha Date: Mon, 5 Oct 2015 16:03:23 +0530 Subject: [PATCH 02/11] Fixed blowfish_secret ERROR with phpmyadmin. #627 --- ee/cli/plugins/stack.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 81826efc..cbc47457 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -1116,6 +1116,11 @@ class EEStackController(CementBaseController): shutil.move('/tmp/phpmyadmin-STABLE/', '{0}22222/htdocs/db/pma/' .format(EEVariables.ee_webroot)) + shutil.move('{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)) + 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 Privileges of webroot permission to ' '{0}22222/htdocs/db/pma file ' .format(EEVariables.ee_webroot)) From adf796372a4837ae27bc002765feb46ba4ab01cc Mon Sep 17 00:00:00 2001 From: prabuddha Date: Mon, 5 Oct 2015 16:04:48 +0530 Subject: [PATCH 03/11] Fixed typo --- ee/cli/plugins/stack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index cbc47457..2452f6e7 100644 --- a/ee/cli/plugins/stack.py +++ b/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 " From 8a9e9daad27db93bbca902423efd71577bad4f32 Mon Sep 17 00:00:00 2001 From: harshadyeola Date: Wed, 7 Oct 2015 11:27:07 +0530 Subject: [PATCH 04/11] Fix #625 --- ee/cli/plugins/site.py | 10 +++++----- ee/cli/plugins/site_functions.py | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ee/cli/plugins/site.py b/ee/cli/plugins/site.py index fd2b7984..3e393642 100644 --- a/ee/cli/plugins/site.py +++ b/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', diff --git a/ee/cli/plugins/site_functions.py b/ee/cli/plugins/site_functions.py index 28a310f6..6d92448c 100644 --- a/ee/cli/plugins/site_functions.py +++ b/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) From a9f3d7cbf468d0888f21395f3a6192456022f0bb Mon Sep 17 00:00:00 2001 From: prabuddha Date: Wed, 7 Oct 2015 13:53:33 +0530 Subject: [PATCH 05/11] Fix pma travis issue --- ee/cli/plugins/stack.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 2452f6e7..8b227687 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -1116,11 +1116,21 @@ class EEStackController(CementBaseController): shutil.move('/tmp/phpmyadmin-STABLE/', '{0}22222/htdocs/db/pma/' .format(EEVariables.ee_webroot)) - shutil.move('{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)) + 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)) + 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 Privileges of webroot permission to ' '{0}22222/htdocs/db/pma file ' .format(EEVariables.ee_webroot)) From c82c2b3d3c9a38b7293a585f2e304cfbe30b57eb Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 8 Oct 2015 16:00:40 +0530 Subject: [PATCH 06/11] Update version --- ee/core/variables.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index 4c49b8f1..ac6ed806 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.3.8" + ee_version = "3.3.9" # EasyEngine packages versions diff --git a/setup.py b/setup.py index 69129392..71e6bf82 100644 --- a/setup.py +++ b/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=[], From 5bded76eb57d2853eba9e204c5ba802c548eea77 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 8 Oct 2015 16:04:05 +0530 Subject: [PATCH 07/11] update version --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index 7891ea36..c55764e5 100644 --- a/install +++ b/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}') From 65f1ae4135f3d36c4391b369bef678f9d00672d5 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Thu, 8 Oct 2015 16:04:38 +0530 Subject: [PATCH 08/11] Update CHANGELOG.txt --- CHANGELOG.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 7e8fa010..631d1569 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,7 @@ +v 3.3.9 - Oct 8, 2015 +- Fix #625 +- Fix #627 + v 3.3.8 - Sep 9, 2015 - # Fix White screen for NGINX PLUS users From 5a6be9da2273713a371ea5fd4a435dc17e5811da Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Fri, 9 Oct 2015 13:13:42 +0530 Subject: [PATCH 09/11] Fix phpmyadmin for remote mysql connection --- ee/cli/plugins/stack.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 8b227687..b474b8b8 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -1131,6 +1131,14 @@ class EEStackController(CementBaseController): .format(EEVariables.ee_webroot), "$cfg[\'blowfish_secret\'] = \'\';","$cfg[\'blowfish_secret\'] = \'{0}\';" .format(blowfish_key)) + Log.debug(self, 'Setting HOST Server For Remote 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)) From 35230d80f909ff2e14ba49c56e99309d9e71e44c Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Fri, 9 Oct 2015 13:26:00 +0530 Subject: [PATCH 10/11] Update CHANGELOG.txt --- CHANGELOG.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 631d1569..0eb1dcf4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ -v 3.3.9 - Oct 8, 2015 +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 From 264fc387a503885359cd4181668686a2ee2a2efd Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Fri, 9 Oct 2015 13:54:53 +0530 Subject: [PATCH 11/11] ee debug log update for pma --- ee/cli/plugins/stack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index b474b8b8..2b1db1b9 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -1131,7 +1131,7 @@ class EEStackController(CementBaseController): .format(EEVariables.ee_webroot), "$cfg[\'blowfish_secret\'] = \'\';","$cfg[\'blowfish_secret\'] = \'{0}\';" .format(blowfish_key)) - Log.debug(self, 'Setting HOST Server For Remote Mysql to ' + 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,