Merge pull request #242 from CartoDB/static-controllers

Upgrade windshaft for static previews
This commit is contained in:
Raul Ochoa 2015-01-14 15:45:22 +01:00
commit 41f6a172ee
9 changed files with 673 additions and 51 deletions

View File

@ -2,6 +2,7 @@ addons:
postgresql: "9.3"
before_install:
- sudo apt-get install -y pkg-config libcairo2-dev libjpeg8-dev libgif-dev
- createdb template_postgis
- psql -c "CREATE EXTENSION postgis" template_postgis

View File

@ -1,6 +1,12 @@
1.22.1 -- 2015-mm-dd
1.23.0 -- 2015-mm-dd
--------------------
Announcements:
- Upgrades windshaft to 0.33.0
New features:
- Sets HTTP renderer configuration in server_options
1.22.0 -- 2015-01-13
--------------------

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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,

674
npm-shrinkwrap.json generated
View File

@ -96,7 +96,7 @@
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1"
"from": "inherits@2"
}
}
}
@ -176,15 +176,20 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
},
"windshaft": {
"version": "0.32.4",
"from": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
"version": "0.33.0",
"from": "https://github.com/CartoDB/Windshaft/tarball/0.33.0",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/0.33.0",
"dependencies": {
"chronograph": {
"version": "0.1.0",
"from": "chronograph@git://github.com/CartoDB/chronographjs.git#0.1.0",
"resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
},
"queue-async": {
"version": "1.0.7",
"from": "queue-async@~1.0.7",
"resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
},
"grainstore": {
"version": "0.22.1",
"from": "https://github.com/CartoDB/grainstore/tarball/0.22.1",
@ -223,7 +228,8 @@
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
},
"minimist": {
"version": "0.0.10",
@ -777,9 +783,9 @@
}
},
"zipfile": {
"version": "0.5.4",
"version": "0.5.5",
"from": "zipfile@~0.5.2",
"resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.4.tgz",
"resolved": "https://registry.npmjs.org/zipfile/-/zipfile-0.5.5.tgz",
"dependencies": {
"nan": {
"version": "1.4.1",
@ -1595,7 +1601,8 @@
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
},
"minimist": {
"version": "0.0.10",
@ -1653,18 +1660,14 @@
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
},
"minimist": {
"version": "0.0.10",
"from": "minimist@~0.0.1"
}
}
},
"sphericalmercator": {
"version": "1.0.3",
"from": "sphericalmercator@~1.0.1",
"resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz"
}
}
},
@ -1681,11 +1684,6 @@
"version": "1.2.11",
"from": "mime@~1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
},
"sphericalmercator": {
"version": "1.0.3",
"from": "sphericalmercator@~1.0.2",
"resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.3.tgz"
}
}
},
@ -2073,6 +2071,16 @@
}
}
},
"canvas": {
"version": "1.1.6",
"from": "canvas@1.1.6",
"dependencies": {
"nan": {
"version": "1.2.0",
"from": "nan@~1.2.0"
}
}
},
"redis-mpool": {
"version": "0.1.0",
"from": "redis-mpool@git://github.com/CartoDB/node-redis-mpool.git#0.1.0",
@ -2104,30 +2112,14 @@
}
},
"carto": {
"version": "0.9.5-cdb3",
"from": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3",
"resolved": "http://github.com/CartoDB/carto/tarball/0.9.5-cdb3",
"version": "0.14.0",
"from": "https://github.com/CartoDB/carto/tarball/update_to_master",
"resolved": "https://github.com/CartoDB/carto/tarball/update_to_master",
"dependencies": {
"underscore": {
"version": "1.4.4",
"from": "underscore@~1.4.3",
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"
},
"mapnik-reference": {
"version": "5.0.9",
"from": "mapnik-reference@~5.0.7",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-5.0.9.tgz"
},
"xml2js": {
"version": "0.2.8",
"from": "xml2js@~0.2.4",
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz",
"dependencies": {
"sax": {
"version": "0.5.8",
"from": "sax@0.5.x"
}
}
"version": "6.0.5",
"from": "mapnik-reference@~6.0.2",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz"
},
"optimist": {
"version": "0.6.1",
@ -2136,7 +2128,8 @@
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2"
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
},
"minimist": {
"version": "0.0.10",
@ -2152,9 +2145,600 @@
"resolved": "git://github.com/CartoDB/node-step-profiler.git#9b97881e450445bd8a307a9cc372b5129cb4529a"
},
"torque.js": {
"version": "2.2.0",
"from": "torque.js@~2.2.0",
"resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.2.00.tgz"
"version": "2.7.1",
"from": "https://github.com/CartoDB/torque/tarball/master",
"resolved": "https://github.com/CartoDB/torque/tarball/master",
"dependencies": {
"carto": {
"version": "0.15.1",
"from": "https://github.com/CartoDB/carto/archive/master.tar.gz",
"resolved": "https://github.com/CartoDB/carto/archive/master.tar.gz",
"dependencies": {
"mapnik-reference": {
"version": "6.0.5",
"from": "mapnik-reference@~6.0.2",
"resolved": "https://registry.npmjs.org/mapnik-reference/-/mapnik-reference-6.0.5.tgz"
},
"optimist": {
"version": "0.6.1",
"from": "optimist@~0.6.0",
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"dependencies": {
"wordwrap": {
"version": "0.0.2",
"from": "wordwrap@~0.0.2",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
},
"minimist": {
"version": "0.0.10",
"from": "minimist@~0.0.1"
}
}
}
}
}
}
},
"request": {
"version": "2.48.0",
"from": "request@2.48.0",
"resolved": "https://registry.npmjs.org/request/-/request-2.48.0.tgz",
"dependencies": {
"bl": {
"version": "0.9.3",
"from": "bl@~0.9.0",
"resolved": "https://registry.npmjs.org/bl/-/bl-0.9.3.tgz",
"dependencies": {
"readable-stream": {
"version": "1.0.33",
"from": "readable-stream@~1.0.26",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"from": "core-util-is@~1.0.0"
},
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"from": "string_decoder@~0.10.x"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1"
}
}
}
}
},
"caseless": {
"version": "0.7.0",
"from": "caseless@~0.7.0",
"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz"
},
"forever-agent": {
"version": "0.5.2",
"from": "forever-agent@~0.5.0"
},
"form-data": {
"version": "0.1.4",
"from": "form-data@~0.1.0",
"dependencies": {
"mime": {
"version": "1.2.11",
"from": "mime@~1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
},
"async": {
"version": "0.9.0",
"from": "async@~0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
}
}
},
"json-stringify-safe": {
"version": "5.0.0",
"from": "json-stringify-safe@~5.0.0"
},
"mime-types": {
"version": "1.0.2",
"from": "mime-types@~1.0.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
},
"node-uuid": {
"version": "1.4.2",
"from": "node-uuid@~1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"
},
"qs": {
"version": "2.3.3",
"from": "qs@~2.3.1",
"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
},
"tunnel-agent": {
"version": "0.4.0",
"from": "tunnel-agent@~0.4.0"
},
"tough-cookie": {
"version": "0.12.1",
"from": "tough-cookie@>=0.12.0",
"dependencies": {
"punycode": {
"version": "1.3.2",
"from": "punycode@>=0.2.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
}
}
},
"http-signature": {
"version": "0.10.1",
"from": "http-signature@~0.10.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
"dependencies": {
"assert-plus": {
"version": "0.1.5",
"from": "assert-plus@^0.1.5",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
},
"asn1": {
"version": "0.1.11",
"from": "asn1@0.1.11"
},
"ctype": {
"version": "0.5.3",
"from": "ctype@0.5.3",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
}
}
},
"oauth-sign": {
"version": "0.5.0",
"from": "oauth-sign@~0.5.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz"
},
"hawk": {
"version": "1.1.1",
"from": "hawk@1.1.1",
"dependencies": {
"hoek": {
"version": "0.9.1",
"from": "hoek@0.9.x",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
},
"boom": {
"version": "0.4.2",
"from": "boom@0.4.x"
},
"cryptiles": {
"version": "0.2.2",
"from": "cryptiles@0.2.x"
},
"sntp": {
"version": "0.2.4",
"from": "sntp@0.2.x"
}
}
},
"aws-sign2": {
"version": "0.5.0",
"from": "aws-sign2@~0.5.0"
},
"stringstream": {
"version": "0.0.4",
"from": "stringstream@~0.0.4"
},
"combined-stream": {
"version": "0.0.7",
"from": "combined-stream@~0.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
"from": "delayed-stream@0.0.5",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
}
}
}
}
},
"abaculus": {
"version": "1.1.0",
"from": "https://github.com/CartoDB/abaculus/tarball/cdb",
"resolved": "https://github.com/CartoDB/abaculus/tarball/cdb",
"dependencies": {
"mapnik": {
"version": "1.4.15",
"from": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
"resolved": "https://github.com/CartoDB/node-mapnik/tarball/1.4.15-cdb",
"dependencies": {
"nan": {
"version": "1.2.0",
"from": "nan@~1.2.0"
},
"mapnik-vector-tile": {
"version": "0.5.5",
"from": "mapnik-vector-tile@0.5.5",
"resolved": "https://registry.npmjs.org/mapnik-vector-tile/-/mapnik-vector-tile-0.5.5.tgz"
},
"node-pre-gyp": {
"version": "0.5.25",
"from": "node-pre-gyp@0.5.25",
"resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.25.tgz",
"dependencies": {
"nopt": {
"version": "3.0.1",
"from": "nopt@~3.0.1",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz",
"dependencies": {
"abbrev": {
"version": "1.0.5",
"from": "abbrev@1",
"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz"
}
}
},
"npmlog": {
"version": "0.1.1",
"from": "npmlog@~0.1.1",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz",
"dependencies": {
"ansi": {
"version": "0.3.0",
"from": "ansi@~0.3.0",
"resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz"
}
}
},
"request": {
"version": "2.40.0",
"from": "request@2.x",
"resolved": "https://registry.npmjs.org/request/-/request-2.40.0.tgz",
"dependencies": {
"qs": {
"version": "1.0.2",
"from": "qs@~1.0.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz"
},
"json-stringify-safe": {
"version": "5.0.0",
"from": "json-stringify-safe@~5.0.0",
"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz"
},
"mime-types": {
"version": "1.0.2",
"from": "mime-types@~1.0.1",
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"
},
"forever-agent": {
"version": "0.5.2",
"from": "forever-agent@~0.5.0",
"resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
},
"node-uuid": {
"version": "1.4.1",
"from": "node-uuid@~1.4.0",
"resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"
},
"tough-cookie": {
"version": "0.12.1",
"from": "tough-cookie@>=0.12.0",
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
"dependencies": {
"punycode": {
"version": "1.3.1",
"from": "punycode@>=0.2.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.1.tgz"
}
}
},
"form-data": {
"version": "0.1.4",
"from": "form-data@~0.1.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
"dependencies": {
"combined-stream": {
"version": "0.0.5",
"from": "combined-stream@~0.0.4",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.5.tgz",
"dependencies": {
"delayed-stream": {
"version": "0.0.5",
"from": "delayed-stream@0.0.5",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"
}
}
},
"mime": {
"version": "1.2.11",
"from": "mime@~1.2.11",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
},
"async": {
"version": "0.9.0",
"from": "async@~0.9.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.0.tgz"
}
}
},
"tunnel-agent": {
"version": "0.4.0",
"from": "tunnel-agent@~0.4.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz"
},
"http-signature": {
"version": "0.10.0",
"from": "http-signature@~0.10.0",
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.0.tgz",
"dependencies": {
"assert-plus": {
"version": "0.1.2",
"from": "assert-plus@0.1.2",
"resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz"
},
"asn1": {
"version": "0.1.11",
"from": "asn1@0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
},
"ctype": {
"version": "0.5.2",
"from": "ctype@0.5.2",
"resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz"
}
}
},
"oauth-sign": {
"version": "0.3.0",
"from": "oauth-sign@~0.3.0",
"resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz"
},
"hawk": {
"version": "1.1.1",
"from": "hawk@1.1.1",
"resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
"dependencies": {
"hoek": {
"version": "0.9.1",
"from": "hoek@0.9.x",
"resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
},
"boom": {
"version": "0.4.2",
"from": "boom@0.4.x",
"resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
},
"cryptiles": {
"version": "0.2.2",
"from": "cryptiles@0.2.x",
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"
},
"sntp": {
"version": "0.2.4",
"from": "sntp@0.2.x",
"resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"
}
}
},
"aws-sign2": {
"version": "0.5.0",
"from": "aws-sign2@~0.5.0",
"resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"
},
"stringstream": {
"version": "0.0.4",
"from": "stringstream@~0.0.4",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz"
}
}
},
"semver": {
"version": "3.0.1",
"from": "semver@~3.0.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-3.0.1.tgz"
},
"tar": {
"version": "1.0.1",
"from": "tar@~1.0.0",
"resolved": "https://registry.npmjs.org/tar/-/tar-1.0.1.tgz",
"dependencies": {
"block-stream": {
"version": "0.0.7",
"from": "block-stream@*",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
},
"fstream": {
"version": "1.0.2",
"from": "fstream@^1.0.2",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.2.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"from": "graceful-fs@3",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"tar-pack": {
"version": "2.0.0",
"from": "tar-pack@~2.0.0",
"resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz",
"dependencies": {
"uid-number": {
"version": "0.0.3",
"from": "uid-number@0.0.3",
"resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"
},
"once": {
"version": "1.1.1",
"from": "once@~1.1.1",
"resolved": "https://registry.npmjs.org/once/-/once-1.1.1.tgz"
},
"debug": {
"version": "0.7.4",
"from": "debug@~0.7.2",
"resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
},
"fstream": {
"version": "0.1.31",
"from": "fstream@~0.1.22",
"resolved": "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz",
"dependencies": {
"graceful-fs": {
"version": "3.0.2",
"from": "graceful-fs@~3.0.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.2.tgz"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"tar": {
"version": "0.1.20",
"from": "tar@~0.1.17",
"resolved": "https://registry.npmjs.org/tar/-/tar-0.1.20.tgz",
"dependencies": {
"block-stream": {
"version": "0.0.7",
"from": "block-stream@*",
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"fstream-ignore": {
"version": "0.0.7",
"from": "fstream-ignore@0.0.7",
"resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz",
"dependencies": {
"minimatch": {
"version": "0.2.14",
"from": "minimatch@~0.2.0",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
"dependencies": {
"lru-cache": {
"version": "2.5.0",
"from": "lru-cache@2",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz"
},
"sigmund": {
"version": "1.0.0",
"from": "sigmund@~1.0.0",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz"
}
}
},
"inherits": {
"version": "2.0.1",
"from": "inherits@2",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"readable-stream": {
"version": "1.0.31",
"from": "readable-stream@~1.0.2",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz",
"dependencies": {
"core-util-is": {
"version": "1.0.1",
"from": "core-util-is@~1.0.0",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
},
"isarray": {
"version": "0.0.1",
"from": "isarray@0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
},
"string_decoder": {
"version": "0.10.31",
"from": "string_decoder@~0.10.x",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
},
"inherits": {
"version": "2.0.1",
"from": "inherits@~2.0.1",
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
}
}
},
"graceful-fs": {
"version": "1.2.3",
"from": "graceful-fs@1.2",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
}
}
},
"mkdirp": {
"version": "0.5.0",
"from": "mkdirp@~0.5.0",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
"dependencies": {
"minimist": {
"version": "0.0.8",
"from": "minimist@0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
}
}
},
"rc": {
"version": "0.5.1",
"from": "rc@~0.5.0",
"resolved": "https://registry.npmjs.org/rc/-/rc-0.5.1.tgz",
"dependencies": {
"minimist": {
"version": "0.0.10",
"from": "minimist@~0.0.7",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
},
"deep-extend": {
"version": "0.2.11",
"from": "deep-extend@~0.2.5",
"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz"
},
"strip-json-comments": {
"version": "0.1.3",
"from": "strip-json-comments@0.1.x",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz"
},
"ini": {
"version": "1.1.0",
"from": "ini@~1.1.0",
"resolved": "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz"
}
}
},
"rimraf": {
"version": "2.2.8",
"from": "rimraf@~2.2.8",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz"
}
}
}
}
}
}
},
"sphericalmercator": {
"version": "1.0.2",
"from": "sphericalmercator@1.0.2"
},
"node-statsd": {
"version": "0.0.7",

View File

@ -25,7 +25,7 @@
"node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
"underscore" : "~1.6.0",
"dot": "~1.0.2",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.32.4",
"windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.33.0",
"step": "~0.0.5",
"request": "~2.9.203",
"cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",