diff --git a/config/postgres.json b/config/postgres.json deleted file mode 100644 index dae20ca4..00000000 --- a/config/postgres.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "user": "lamassu", - "pwd": "lamassu", - "host": "localhost", - "db": "lamassu" -} diff --git a/lib/app.js b/lib/app.js index ecf044cc..bfb0074c 100755 --- a/lib/app.js +++ b/lib/app.js @@ -26,17 +26,10 @@ var app = express(); var fs = require('fs'); var LamassuConfig = require('lamassu-config'); var atm = require('lamassu-atm-protocol'); -var format = require('util').format; var conString, dbConfig, config; -if (process.env.DATABASE_URL) { - conString = process.env.DATABASE_URL; -} -else { - dbConfig = require('../config/postgres.json'); - conString = format('postgres://%s:%s@%s/%s', dbConfig.user, dbConfig.pwd, dbConfig.host, dbConfig.db); -} +conString = process.env.DATABASE_URL || 'postgres://lamassu:lamassu@localhost/lamassu'; config = new LamassuConfig(conString);