Split between old cache_enabled and new purge_enabled configuration

config/environments/development.js.example

@@ -151,6 +151,7 @@ var config = {
         host: 'localhost',
         port: 6082,
         http_port: 6081,
+        purge_enabled: false,
         secret: 'xxx',
         ttl: 86400,
         layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses

config/environments/production.js.example

@@ -145,6 +145,7 @@ var config = {
         host: 'localhost',
         port: 6082,
         http_port: 6081,
+        purge_enabled: false,
         secret: 'xxx',
         ttl: 86400,
         layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses

config/environments/staging.js.example

@@ -145,6 +145,7 @@ var config = {
         host: 'localhost',
         port: 6082,
         http_port: 6081,
+        purge_enabled: false,
         secret: 'xxx',
         ttl: 86400,
         layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses

config/environments/test.js.example

@@ -147,6 +147,7 @@ var config = {
         host: '',
         port: null,
         http_port: 6081,
+        purge_enabled: false,
         secret: 'xxx',
         ttl: 86400,
         layergroupTtl: 86400 // the max-age for cache-control header in layergroup responses

lib/cartodb/cartodb_windshaft.js

@@ -25,6 +25,15 @@ var CartodbWindshaft = function(serverOptions) {
 
     var cartoData = require('cartodb-redis')({pool: redisPool});
 
+    if(serverOptions.cache_enabled) {
+        console.log("cache invalidation enabled, varnish on ", serverOptions.varnish_host, ' ', serverOptions.varnish_port);
+        Cache.init(serverOptions.varnish_host, serverOptions.varnish_port, serverOptions.varnish_secret);
+        serverOptions.afterStateChange = function(req, data, callback) {
+            Cache.invalidate_db(req.params.dbname, req.params.table);
+            callback(null, data);
+        };
+    }
+
     serverOptions.beforeStateChange = function(req, callback) {
         var err = null;
         if ( ! req.params.hasOwnProperty('_authorizedByApiKey') ) {
@@ -51,16 +60,7 @@ var CartodbWindshaft = function(serverOptions) {
         varnishHttpCacheBackend = new VarnishHttpCacheBackend(serverOptions.varnish_host, serverOptions.varnish_http_port),
         surrogateKeysCache = new SurrogateKeysCache(varnishHttpCacheBackend);
 
-    if (serverOptions.cache_enabled) {
-
-        console.log("cache invalidation enabled, varnish on ", serverOptions.varnish_host, ' ', serverOptions.varnish_port);
-
-        Cache.init(serverOptions.varnish_host, serverOptions.varnish_port, serverOptions.varnish_secret);
-        serverOptions.afterStateChange = function(req, data, callback) {
-            Cache.invalidate_db(req.params.dbname, req.params.table);
-            callback(null, data);
-        };
-
+    if (serverOptions.varnish_purge_enabled) {
         function invalidateNamedMap(owner, templateName) {
             surrogateKeysCache.invalidate(new NamedMapsCacheEntry(owner, templateName), function(err) {
                 if (err) {

lib/cartodb/server_options.js

@@ -91,6 +91,7 @@ module.exports = function(redisPool) {
         varnish_port: global.environment.varnish.port,
         varnish_http_port: global.environment.varnish.http_port,
         varnish_secret: global.environment.varnish.secret,
+        varnish_purge_enabled: global.environment.varnish.purge_enabled,
         cache_enabled: global.environment.cache_enabled,
         log_format: global.environment.log_format,
         useProfiler: global.environment.useProfiler