Merge tag 'v3.3.1' into develop

EasyEngine v3.3.1

.travis.yml

@@ -65,17 +65,17 @@ script:
   - sudo ee site create site12.in --wpfc --wpsubdomain
   - sudo ee site create site12.net --wpfc --wpsubdomain
 
-  - sudo ee site create site.hhvm.pagespeed2.com --wpsc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed2.com --wpsc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed3.com --w3tc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed3.com --w3tc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed4.com --wpfc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed4.com --wpfc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed5.com --wpsubdir --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed5.com --wpsubdir --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed6.com --wpsubdir --wpsc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed6.com --wpsubdir --wpsc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed7.com --wpsubdir --w3tc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed7.com --wpsubdir --w3tc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed8.com --wpsubdir --wpfc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed8.com --wpsubdir --wpfc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed9.com --wpsubdomain --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed9.com --wpsubdomain --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed10.org --wpsubdomain --wpsc --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed10.org --wpsubdomain --wpsc --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed11.in --w3tc --wpsubdomain --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed11.in --w3tc --wpsubdomain --hhvm --pagespeed
-  - sudo ee site create site.hhvm.pagespeed12.in --wpfc --wpsubdomain --hhvm --pagespeed
+  - yes | sudo ee site create site.hhvm.pagespeed12.in --wpfc --wpsubdomain --hhvm --pagespeed
 
   - sudo ee debug --all
   - sudo ee debug --all=off
@@ -100,8 +100,8 @@ script:
   - sudo ee site update site9.com --wpsubdomain --wpfc
   - sudo ee site update site9.com --wpsubdomain --w3tc
   - sudo ee site update site9.com --wpsubdomain --wpsc
-  - sudo ee site update site.hhvm.pagespeed12.in --pagespeed=off --hhvm=off
+  - yes | sudo ee site update site.hhvm.pagespeed12.in --pagespeed=off --hhvm=off
-  - sudo ee site update site9.com --hhvm --pagespeed
+  - yes | sudo ee site update site9.com --hhvm --pagespeed
   - sudo ee site info site.hhvm.pagespeed12.in
   - sudo ee site info site9.com
 

CHANGELOG.txt

@@ -1,3 +1,7 @@
+v 3.3.1 - Jul 23, 2015
+- Fixed redis query expiration timeout limit
+- Updated redis cache header to more informative
+
 v 3.3.0 - Jul 13, 2015
 - Added support for Redis full page cache
 - Added support to update WPCLI

README.md

@@ -48,6 +48,7 @@ ee site create example.com --wp                  # install wordpress without any
 ee site create example.com --w3tc                # install wordpress with w3-total-cache plugin
 ee site create example.com --wpsc                # install wordpress with wp-super-cache plugin
 ee site create example.com --wpfc                # install wordpress + nginx fastcgi_cache
+ee site create example.com --wpredis             # install wordpress + nginx redis_cache
 ```
 
 ### WordPress Multsite with subdirectory
@@ -57,15 +58,17 @@ ee site create example.com --wpsubdir            # install wpmu-subdirectory wit
 ee site create example.com --wpsubdir --w3tc     # install wpmu-subdirectory with w3-total-cache plugin
 ee site create example.com --wpsubdir --wpsc     # install wpmu-subdirectory with wp-super-cache plugin
 ee site create example.com --wpsubdir --wpfc     # install wpmu-subdirectory + nginx fastcgi_cache
+ee site create example.com --wpsubdir --wpredis  # install wpmu-subdirectory + nginx redis_cache
 ```
 
 ### WordPress Multsite with subdomain
 
 ```bash
-ee site create example.com --wpsubdomin            # install wpmu-subdomain without any page caching
+ee site create example.com --wpsubdomain            # install wpmu-subdomain without any page caching
 ee site create example.com --wpsubdomain --w3tc     # install wpmu-subdomain with w3-total-cache plugin
 ee site create example.com --wpsubdomain --wpsc     # install wpmu-subdomain with wp-super-cache plugin
 ee site create example.com --wpsubdomain --wpfc     # install wpmu-subdomain + nginx fastcgi_cache
+ee site create example.com --wpsubdomain --wpredis  # install wpmu-subdomain + nginx redis_cache
 ```
 
 ### Non-WordPress Sites
@@ -90,13 +93,13 @@ ee site create example.com --php --pagespeed     # create example.com php site w
 ## Cheatsheet - Site creation
 
 
-|                    |  Single Site  | 	Multisite w/ Subdir  |	Multisite w/ Subdom  |
+|                    |  Single Site  | 	Multisite w/ Subdir  |	Multisite w/ Subdom     |
-|--------------------|---------------|-----------------------|-----------------------|
+|--------------------|---------------|-----------------------|--------------------------|
-| **NO Cache**       |  	  --wp     |	    --wpsubdir       |	     --wpsubdomain      |
+| **NO Cache**       |  --wp         |	--wpsubdir           |	--wpsubdomain           |
-| **WP Super Cache** |	  --wpsc     |	  --wpsubdir --wpsc  |  	--wpsubdomain --wpsc  |
+| **WP Super Cache** |	--wpsc       |	--wpsubdir --wpsc    |  --wpsubdomain --wpsc    |
-| **W3 Total Cache** |    --w3tc     |	  --wpsubdir --w3tc  |  	--wpsubdomain --w3tc  |
+| **W3 Total Cache** |  --w3tc       |	--wpsubdir --w3tc    |  --wpsubdomain --w3tc    |
-| **Nginx cache**    |    --wpfc     |    --wpsubdir --wpfc  |  	--wpsubdomain --wpfc  |
+| **Nginx cache**    |  --wpfc       |  --wpsubdir --wpfc    |  --wpsubdomain --wpfc    |
-
+| **Redis cache**    |  --wpredis    |  --wpsubdir --wpredis |  --wpsubdomain --wpredis |
 
 ## Useful Links
 - [Documentation] (http://docs.rtcamp.com/easyengine/)

ee/cli/plugins/site.py

@@ -516,7 +516,7 @@ class EESiteCreateController(CementBaseController):
             pagespeed = 0
 
         if (cache == 'wpredis' and (not self.app.pargs.experimental)):
-            Log.info(self, "Redis is experimental feature and it may not"
+            Log.info(self, "Redis is experimental feature and it may not "
                      "work with all CSS/JS/Cache of your site.\nYou can "
                      "disable it by changing cache later.\nDo you wish"
                      " to enable Redis now for {0}?".format(ee_domain))

ee/cli/templates/redis-hhvm.mustache

@@ -30,7 +30,7 @@ location /redis-store {
     internal  ;
     set_unescape_uri $key $arg_key ;
     redis2_query  set $key $echo_request_body;
-    redis2_query expire $key 6h;
+    redis2_query expire $key 14400;
     redis2_pass  redis;
 
 }
@@ -49,8 +49,8 @@ location ~ \.php$ {
   srcache_fetch GET /redis-fetch $key;
   srcache_store PUT /redis-store key=$escaped_key;
 
-  more_set_headers 'X-Cache $srcache_fetch_status';
+  more_set_headers 'X-SRCache-Fetch-Status $srcache_fetch_status';
-  more_set_headers 'X-Cache-2 $srcache_store_status';
+  more_set_headers 'X-SRCache-Store-Status $srcache_store_status';
 
   include fastcgi_params;
   fastcgi_pass hhvm;

ee/cli/templates/redis.mustache

@@ -49,8 +49,8 @@ location ~ \.php$ {
   srcache_fetch GET /redis-fetch $key;
   srcache_store PUT /redis-store key=$escaped_key;
 
-  more_set_headers 'X-Cache $srcache_fetch_status';
+  more_set_headers 'X-SRCache-Fetch-Status $srcache_fetch_status';
-  more_set_headers 'X-Cache-2 $srcache_store_status';
+  more_set_headers 'X-SRCache-Store-Status $srcache_store_status';
 
   include fastcgi_params;
   fastcgi_pass php;

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.3.0"
+    ee_version = "3.3.1"
 
     # 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.0"
+readonly ee_version_new="3.3.1"
 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}')
@@ -386,6 +386,25 @@ function ee_update_latest()
     fi
 
 
+    # Rename Redis Header
+    if [ -f /etc/nginx/common/redis-hhvm.conf ]; then
+      sed -i "s/X-Cache /X-SRCache-Fetch-Status /g" /etc/nginx/common/redis-hhvm.conf &>> /dev/null
+      sed -i "s/X-Cache-2 /X-SRCache-Store-Status /g" /etc/nginx/common/redis-hhvm.conf &>> /dev/null
+    fi
+
+    if [ -f /etc/nginx/common/redis.conf ]; then
+      sed -i "s/X-Cache /X-SRCache-Fetch-Status /g" /etc/nginx/common/redis.conf &>> /dev/null
+      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
+      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
+    fi
+
 }
 
 # Do git intialisation

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.0',
+      version='3.3.1',
       description=long_description,
       long_description=long_description,
       classifiers=[],