cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autodetect target mapnik version and let config override it

Browse Source 
Closes #40
This commit is contained in:
Sandro Santilli 2012-09-24 17:57:39 +02:00
parent 90f6e464d2
commit 961269fa1f
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/environments/development.js.example
View File

@ -19,6 +19,7 @@ var config = {
*/
simplify: true
}
,mapnik_version: '2.0.2'
,millstone: {
cache_basedir: '/tmp/cdb-tiler-dev/millstone-dev'
}

1
config/environments/production.js.example
View File

@ -13,6 +13,7 @@ var config = {
extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
simplify: true
}
,mapnik_version: '2.0.2'
,millstone: {
cache_basedir: '/home/ubuntu/tile_assets/'
}

1
config/environments/staging.js.example
View File

@ -13,6 +13,7 @@ var config = {
extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
simplify: true
}
,mapnik_version: '2.0.2'
,millstone: {
cache_basedir: '/home/ubuntu/tile_assets/'
}

1
config/environments/test.js.example
View File

@ -14,6 +14,7 @@ var config = {
extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
simplify: true
}
,mapnik_version: '2.0.2'
,millstone: {
cache_basedir: '/tmp/cdb-tiler-test/millstone'
}

7
lib/cartodb/server_options.js
View File

@ -1,14 +1,17 @@
var _ = require('underscore')
, Step = require('step')
, cartoData = require('./carto_data')
, Cache = require('./cache_validator');
, Cache = require('./cache_validator')
, mapnik = require('mapnik')
;
module.exports = function(){
var me = {
base_url: '/tiles/:table',
grainstore: {
datasource: global.environment.postgres,
cachedir: global.environment.millstone.cache_basedir
cachedir: global.environment.millstone.cache_basedir,
mapnik_version: global.environment.mapnik_version || mapnik.versions.mapnik
},
redis: global.environment.redis,
enable_cors: global.environment.enable_cors,

11
npm-shrinkwrap.json generated
View File

@ -1,9 +1,10 @@
{
"name": "windshaft-cartodb",
"version": "0.2.0-dev",
"version": "1.0.0",
"dependencies": {
"cluster2": {
"version": "0.3.5",
"version": "0.3.5-cdb01",
"from": "git://github.com/CartoDB/cluster2.git#28cde11",
"dependencies": {
"express": {
"version": "2.5.11",
@ -299,9 +300,6 @@
"version": "0.3.3-dev",
"from": "git://github.com/Vizzuality/tilelive-mapnik.git#7df70554",
"dependencies": {
"mapnik": {
"version": "0.7.14"
},
"eio": {
"version": "0.1.0"
},
@ -327,6 +325,9 @@
"request": {
"version": "2.9.202"
},
"mapnik": {
"version": "0.7.14"
},
"mocha": {
"version": "1.2.1",
"dependencies": {

3
package.json
View File

@ -27,7 +27,8 @@
"generic-pool": "1.0.x",
"redis": "0.7.2",
"hiredis": "~0.1.14",
"request": "2.9.202"
"request": "2.9.202",
"mapnik": "~0.7.14"
},
"devDependencies": {
"mocha": "1.2.1"