Makes ogr2ogr command configurable so it's possible to change path/bin

app/models/formats/ogr.js

@@ -58,7 +58,7 @@ OgrFormat.prototype.toOGR = function(options, out_format, out_filename, callback
 
   var dbopts = options.dbopts;
 
-  var ogr2ogr = 'ogr2ogr'; // FIXME: make configurable
+  var ogr2ogr = global.settings.ogr2ogrCommand || 'ogr2ogr';
   var dbhost = dbopts.host;
   var dbport = dbopts.port; 
   var dbuser = dbopts.user; 

config/environments/development.js.example

@@ -59,6 +59,8 @@ module.exports.tableCacheMax = 8192;
 module.exports.tableCacheMaxAge = 1000*60*10;
 // Temporary directory, make sure it is writable by server user
 module.exports.tmpDir = '/tmp';
+// change ogr2ogr command or path
+module.exports.ogr2ogrCommand = 'ogr2ogr';
 // Optional statsd support
 module.exports.statsd = {
   host: 'localhost',

config/environments/production.js.example

@@ -60,6 +60,8 @@ module.exports.tableCacheMax = 8192;
 module.exports.tableCacheMaxAge = 1000*60*10;
 // Temporary directory, make sure it is writable by server user
 module.exports.tmpDir = '/tmp';
+// change ogr2ogr command or path
+module.exports.ogr2ogrCommand = 'ogr2ogr';
 // Optional rollbar support
 module.exports.rollbar = {
     token: 'secret',

config/environments/staging.js.example

@@ -60,6 +60,8 @@ module.exports.tableCacheMax = 8192;
 module.exports.tableCacheMaxAge = 1000*60*10;
 // Temporary directory, make sure it is writable by server user
 module.exports.tmpDir = '/tmp';
+// change ogr2ogr command or path
+module.exports.ogr2ogrCommand = 'ogr2ogr';
 // Optional rollbar support
 module.exports.rollbar = {
     token: 'secret',

config/environments/test.js.example

@@ -57,6 +57,8 @@ module.exports.tableCacheMax = 8192;
 module.exports.tableCacheMaxAge = 1000*60*10;
 // Temporary directory, make sure it is writable by server user
 module.exports.tmpDir = '/tmp';
+// change ogr2ogr command or path
+module.exports.ogr2ogrCommand = 'ogr2ogr';
 // Optional statsd support
 module.exports.statsd = {
   host: 'localhost',