From 8d220afe038231c5e45c14b15bd740c1ddd1ed0b Mon Sep 17 00:00:00 2001 From: gau1991 Date: Fri, 19 Jun 2015 18:49:26 +0530 Subject: [PATCH 1/4] Fixed bug that was preventing ee debug to work --- ee/cli/plugins/debug.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py index a450e024..78e5c29a 100644 --- a/ee/cli/plugins/debug.py +++ b/ee/cli/plugins/debug.py @@ -225,9 +225,8 @@ class EEDebugController(CementBaseController): else: hhvmconf=False data = dict(php="9001", debug="9001", hhvm="9001", - hhvmconf=hhvmcof) - - data = dict(php="9000", debug="9001", hhvm="8000") + hhvmconf=hhvmconf) + Log.debug(self, 'Writting the Nginx debug configration to file' ' /etc/nginx/conf.d/upstream.conf ') ee_nginx = open('/etc/nginx/conf.d/upstream.conf', From 65b70093a80f7380a23ce48143d24c8e5412cc88 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Fri, 19 Jun 2015 19:12:26 +0530 Subject: [PATCH 2/4] Fixed PHP debug not disabling --- ee/cli/plugins/debug.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/cli/plugins/debug.py b/ee/cli/plugins/debug.py index 78e5c29a..929f1b67 100644 --- a/ee/cli/plugins/debug.py +++ b/ee/cli/plugins/debug.py @@ -224,9 +224,9 @@ class EEDebugController(CementBaseController): hhvmconf=True else: hhvmconf=False - data = dict(php="9001", debug="9001", hhvm="9001", + data = dict(php="9000", debug="9001", hhvm="8000", hhvmconf=hhvmconf) - + Log.debug(self, 'Writting the Nginx debug configration to file' ' /etc/nginx/conf.d/upstream.conf ') ee_nginx = open('/etc/nginx/conf.d/upstream.conf', From 89882ef1c065ce0a4bcc843e88277417602b018c Mon Sep 17 00:00:00 2001 From: gau1991 Date: Fri, 19 Jun 2015 19:20:41 +0530 Subject: [PATCH 3/4] Version Dump and Changelog updated --- CHANGELOG.txt | 5 ++++- ee/core/variables.py | 2 +- install | 2 +- setup.py | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index be627ce6..23c5379d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,7 @@ -v 3.2.1 - Jun 19, 205 +v 3.2.2 - Jun 20, 2015 +- Fixed bug that was preventing disabling debug + +v 3.2.1 - Jun 19, 2015 - Improved experimental HHVM and Pagespeed handling, fixes #564, #562 - Fixed missing link for Proxy sites #571 - Added hhvm.server.ip for HHVM config #567 diff --git a/ee/core/variables.py b/ee/core/variables.py index 7ecbd959..c615dc0b 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.2.1" + ee_version = "3.2.2" # EasyEngine packages versions ee_wp_cli = "0.19.1" diff --git a/install b/install index e3b09bbc..3488b8de 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.2.1" +readonly ee_version_new="3.2.2" 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 0c1c2112..031cafed 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.2.1', + version='3.2.2', description=long_description, long_description=long_description, classifiers=[], From 005e8993e88f5f6fffbfb3c9aa75bfcdcfa0d220 Mon Sep 17 00:00:00 2001 From: gau1991 Date: Fri, 19 Jun 2015 19:20:51 +0530 Subject: [PATCH 4/4] Version Dump and Changelog updated --- CHANGELOG.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 23c5379d..f0f8262e 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,4 @@ -v 3.2.2 - Jun 20, 2015 +v 3.2.2 - Jun 19, 2015 - Fixed bug that was preventing disabling debug v 3.2.1 - Jun 19, 2015