From 13a752e62a596eacd07a1ff1d6d3d841aae695b7 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 1 Mar 2016 15:32:10 +0530 Subject: [PATCH 1/5] Fix xdebug for php5.6 repo --- ee/cli/plugins/stack.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ee/cli/plugins/stack.py b/ee/cli/plugins/stack.py index 1aaeb35f..6fb582ad 100644 --- a/ee/cli/plugins/stack.py +++ b/ee/cli/plugins/stack.py @@ -1105,8 +1105,8 @@ class EEStackController(CementBaseController): "profiler_enable] = off\n") # Disable xdebug - if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/mods-available/xdebug.ini"): - EEFileUtils.searchreplace(self, "/etc/php/mods-available/" + if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/5.6/mods-available/xdebug.ini"): + EEFileUtils.searchreplace(self, "/etc/php/5.6/mods-available/" "xdebug.ini", "zend_extension", ";zend_extension") @@ -1244,8 +1244,8 @@ class EEStackController(CementBaseController): "profiler_enable] = off\n") # Disable xdebug - if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/mods-available/xdebug.ini"): - EEFileUtils.searchreplace(self, "/etc/php/mods-available/" + if not EEShellExec.cmd_exec(self, "grep -q \';zend_extension\' /etc/php/7.0/mods-available/xdebug.ini"): + EEFileUtils.searchreplace(self, "/etc/php/7.0/mods-available/" "xdebug.ini", "zend_extension", ";zend_extension") From 549c3d019181cce4760083a0e627e12bf1c2656c Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 12:16:47 +0530 Subject: [PATCH 2/5] Update Version v3.5.3 --- ee/core/variables.py | 2 +- install | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ee/core/variables.py b/ee/core/variables.py index aca2bc8b..b3242381 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.5.2" + ee_version = "3.5.3" # EasyEngine packages versions diff --git a/install b/install index a7d66838..4e9a5bd8 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.5.2" +readonly ee_version_new="3.5.3" 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}') diff --git a/setup.py b/setup.py index d0f747c0..b71e92cd 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,7 @@ if not os.path.isfile('/root/.gitconfig'): shutil.copy2(os.path.expanduser("~")+'/.gitconfig', '/root/.gitconfig') setup(name='ee', - version='3.5.2', + version='3.5.3', description=long_description, long_description=long_description, classifiers=[], From 86fc81e697b28c941da283bcb950a41aad07b45e Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 13:03:50 +0530 Subject: [PATCH 3/5] Fix #650 --- ee/cli/plugins/stack_upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/cli/plugins/stack_upgrade.py b/ee/cli/plugins/stack_upgrade.py index 24560dc6..c492f31a 100644 --- a/ee/cli/plugins/stack_upgrade.py +++ b/ee/cli/plugins/stack_upgrade.py @@ -253,7 +253,7 @@ class EEStackUpgradeController(CementBaseController): if set(EEVariables.ee_postfix).issubset(set(apt_packages)): EEService.restart_service(self, 'postfix') if set(EEVariables.ee_mysql).issubset(set(apt_packages)): - EEService.restart_service(self, 'hhvm') + EEService.restart_service(self, 'mysql') if set(EEVariables.ee_mail).issubset(set(apt_packages)): EEService.restart_service(self, 'dovecot') if set(EEVariables.ee_redis).issubset(set(apt_packages)): From f3044d6175efb8b1f89eff055e1b092fe36a19b7 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 14:57:52 +0530 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5abeef7f..64d7e3d0 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,6 @@ +v3.5.3 - Feb 25, 2016 +- Fixed #650 + v3.5.2 - Feb 25, 2016 - Fixed PHP package dependency (Trusty) From 07208d2947ef983cc57dfc9339fef80ed210458b Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Wed, 2 Mar 2016 14:59:40 +0530 Subject: [PATCH 5/5] Update CHANGELOG --- CHANGELOG.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 64d7e3d0..143f6006 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,6 @@ v3.5.3 - Feb 25, 2016 - Fixed #650 +- Fixed #681 v3.5.2 - Feb 25, 2016 - Fixed PHP package dependency (Trusty)