From 0962f9bd6087f0903ece2cabcc5bdc989f608088 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 16:20:27 +0530 Subject: [PATCH 1/6] Fix redis cache doesnot work with hhvm #598 --- ee/cli/templates/redis-hhvm.mustache | 1 + 1 file changed, 1 insertion(+) diff --git a/ee/cli/templates/redis-hhvm.mustache b/ee/cli/templates/redis-hhvm.mustache index 22355e232..9efa2236a 100644 --- a/ee/cli/templates/redis-hhvm.mustache +++ b/ee/cli/templates/redis-hhvm.mustache @@ -53,5 +53,6 @@ location ~ \.php$ { more_set_headers 'X-SRCache-Store-Status $srcache_store_status'; include fastcgi_params; + fastcgi_param HTTP_ACCEPT_ENCODING ""; fastcgi_pass hhvm; } From a55f8df36b80ea564d488cd81f98a0497d40eaea Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 19:21:52 +0530 Subject: [PATCH 2/6] Update install script --- install | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/install b/install index 2ea608e82..4349d597e 100644 --- a/install +++ b/install @@ -294,7 +294,7 @@ function ee_update_latest() mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null apt-get update apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom - + fi elif [ "$ee_distro_version" == "trusty" ]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/xUbuntu_14.04/ /' /etc/apt/sources.list.d/ &>> /dev/null @@ -310,7 +310,7 @@ function ee_update_latest() fi mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf.old &>> /dev/null apt-get update - apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom + apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom fi elif [ "$ee_distro_version" == "wheezy" ]; then grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_7.0/ /' /etc/apt/sources.list.d/ &>> /dev/null @@ -333,8 +333,8 @@ function ee_update_latest() apt-get -o Dpkg::Options::="--force-confmiss" -o Dpkg::Options::="--force-confold" -y install nginx-custom fi elif [ "$ee_distro_version" == "jessie" ]; then - - grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null + + grep -Hr 'http://download.opensuse.org/repositories/home:/rtCamp:/EasyEngine/Debian_8.0/ /' /etc/apt/sources.list.d/ &>> /dev/null #grep -Hr "deb http://packages.dotdeb.org jessie all" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null if [[ $? -ne 0 ]]; then #sed -i "/deb http:\/\/packages.dotdeb.org jessie all/d" /etc/apt/sources.list.d/ee-repo.list &>> /dev/null @@ -407,17 +407,24 @@ function ee_update_latest() sed -i "s/X-Cache-2 /X-SRCache-Store-Status /g" /etc/nginx/common/redis.conf &>> /dev/null fi - # Update Timeout redis-hhvm.conf + if [ -f /etc/nginx/common/redis-hhvm.conf ]; then + # Update Timeout redis-hhvm.conf grep -0 'redis2_query expire $key 6h' /etc/nginx/common/redis-hhvm.conf &>> /dev/null if [ $? -eq 0 ]; then sed -i 's/redis2_query expire $key 6h/redis2_query expire $key 14400/g' /etc/nginx/common/redis-hhvm.conf &>> /dev/null fi + + #Fix for 3.3.4 redis-hhvm issue + grep -0 'HTTP_ACCEPT_ENCODING' /etc/nginx/common/redis-hhvm.conf &>> /dev/null + if [ $? -nq 0 ]; then + sed -i 's/fastcgi_params;/fastcgi_params;\n fastcgi_param HTTP_ACCEPT_ENCODING "";/g' /etc/nginx/common/redis-hhvm.conf &>> /dev/null + fi fi # Fix for 3.3.2 renamed nginx.conf - nginx -V 2>&1 &>>/dev/null - if [[ $? -eq 0 ]]; then + nginx -V 2>&1 &>>/dev/null + if [[ $? -eq 0 ]]; then nginx -t 2>&1 | grep 'open() "/etc/nginx/nginx.conf" failed' &>>/dev/null if [[ $? -eq 0 ]]; then if [ -f /etc/nginx/nginx.conf.old ]; then @@ -436,6 +443,8 @@ function ee_update_latest() fi fi fi + + } # Do git intialisation From eed5ea394cfde50f6e6f4a1f16591a8f3df2bada Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 22:05:49 +0530 Subject: [PATCH 3/6] Update version --- install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install b/install index 4349d597e..a240c94cf 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.3" +readonly ee_version_new="3.3.4" 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}') @@ -444,7 +444,7 @@ function ee_update_latest() fi fi - + } # Do git intialisation From ef019d6306afc4ed9f165571dd17539208b8708c Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 22:09:48 +0530 Subject: [PATCH 4/6] Fix typo error --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install b/install index a240c94cf..bb4c9822c 100644 --- a/install +++ b/install @@ -417,7 +417,7 @@ function ee_update_latest() #Fix for 3.3.4 redis-hhvm issue grep -0 'HTTP_ACCEPT_ENCODING' /etc/nginx/common/redis-hhvm.conf &>> /dev/null - if [ $? -nq 0 ]; then + if [ $? -ne 0 ]; then sed -i 's/fastcgi_params;/fastcgi_params;\n fastcgi_param HTTP_ACCEPT_ENCODING "";/g' /etc/nginx/common/redis-hhvm.conf &>> /dev/null fi fi From 7bab653b43bd022aa56ed3ba4a26b09b2c7bfea9 Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 22:28:49 +0530 Subject: [PATCH 5/6] Update CHANGELOG --- CHANGELOG.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 93d97799c..24d7a2431 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,8 +1,11 @@ +v 3.3.4 - Aug 12, 2015 +- Bug Fix for https://github.com/rtCamp/easyengine/issues/598#issue-98354466 + v 3.3.3 - Jul 28, 2015 - Bug Fix for https://github.com/rtCamp/easyengine/issues/593#issuecomment-125274633 v 3.3.2 - Jul 27, 2015 -- Bug Fix #593 +- Bug Fix #593 - Fix package authentication problems - Version update roundcube 1.1.2 - Version update vimbadmin to 3.0.12 From efea307e60161ca0cab6d13d9ce2a146339739dc Mon Sep 17 00:00:00 2001 From: Prabuddha Chakraborty Date: Tue, 11 Aug 2015 22:29:48 +0530 Subject: [PATCH 6/6] 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 97f038900..91b2896d3 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.3" + ee_version = "3.3.4" # EasyEngine packages versions ee_wp_cli = "0.19.2" diff --git a/setup.py b/setup.py index 5850f80b9..0c9f2263d 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ os.system("git config --global user.email {0}".format(ee_email)) setup(name='ee', - version='3.3.3', + version='3.3.4', description=long_description, long_description=long_description, classifiers=[],