diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 86aea6ce..f9bc51be 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -88,7 +88,14 @@ var config = { cache_ttl: 60000, metatile: 4, bufferSize: 64, - statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status + statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + http: { + timeout: 2000, // the timeout in ms for a http tile request + proxy: undefined, // the url for a proxy server + whitelist: [ // the whitelist of urlTemplates that can be used + 'http://{s}.example.com/{z}/{x}/{y}.png' + ] + } } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 8d20f27a..69585a92 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -82,7 +82,14 @@ var config = { cache_ttl: 60000, metatile: 4, bufferSize: 64, - statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status + statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + http: { + timeout: 2000, // the timeout in ms for a http tile request + proxy: undefined, // the url for a proxy server + whitelist: [ // the whitelist of urlTemplates that can be used + 'http://{s}.example.com/{z}/{x}/{y}.png' + ] + } } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 8b1ba7a8..311eaaec 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -82,7 +82,14 @@ var config = { cache_ttl: 60000, metatile: 4, bufferSize: 64, - statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status + statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + http: { + timeout: 2000, // the timeout in ms for a http tile request + proxy: undefined, // the url for a proxy server + whitelist: [ // the whitelist of urlTemplates that can be used + 'http://{s}.example.com/{z}/{x}/{y}.png' + ] + } } ,millstone: { // Needs to be writable by server user diff --git a/config/environments/test.js.example b/config/environments/test.js.example index e2882331..2b931f38 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -82,7 +82,14 @@ var config = { cache_ttl: 60000, metatile: 4, bufferSize: 64, - statsInterval: 5000 // milliseconds between each report to statsd about number of renderers and mapnik pool status + statsInterval: 5000, // milliseconds between each report to statsd about number of renderers and mapnik pool status + http: { + timeout: 2000, // the timeout in ms for a http tile request + proxy: undefined, // the url for a proxy server + whitelist: [ // the whitelist of urlTemplates that can be used + 'http://{s}.example.com/{z}/{x}/{y}.png' + ] + } } ,millstone: { // Needs to be writable by server user diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index adea9a3c..f86a9673 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -64,6 +64,9 @@ module.exports = function(redisPool) { ttl: rendererConfig.cache_ttl, statsInterval: rendererConfig.statsInterval }, + renderer: { + http: rendererConfig.http + }, redis: global.environment.redis, enable_cors: global.environment.enable_cors, varnish_host: global.environment.varnish.host,