Merge branch 'hotfix/v3.3.4'

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

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;
 }

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"

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}')
@@ -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 [ $? -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
 
     # 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

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=[],