config fixes

bin/convert-txs.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 var pgp = require('pg-promise')()
-var psqlUrl = require('../lib/options').postgres
+var psqlUrl = require('../lib/options').postgresql
 
 var db = pgp(psqlUrl)
 

bin/ssu

@@ -8,7 +8,7 @@ var argv = process.argv.slice(2)
 var pgp = require('pg-promise')()
 var inquirer = require('inquirer')
 var R = require('ramda')
-var psqlUrl = require('../lib/options').postgres
+var psqlUrl = require('../lib/options').postgresql
 
 var cmd = argv[0]
 

bin/ssu-raqia

@@ -11,7 +11,7 @@ var _ = require('lodash');
 var pg = require('pg');
 var uuid = require('node-uuid');
 var async = require('async');
-var psqlUrl = require('../lib/options').postgres
+var psqlUrl = require('../lib/options').postgresql
 
 var raqiaPath = path.join(__dirname, '..', 'raqia.json');
 

lib/app.js

@@ -11,7 +11,6 @@ var logger = require('./logger')
 
 module.exports = function (options) {
   var app = express()
-  var connectionString
   var server
   var lamassuConfig
 
@@ -24,7 +23,7 @@ module.exports = function (options) {
   lamassuConfig = new LamassuConfig(psqlUrl)
 
   const seedPath = options.seedPath || './seeds/seed.txt'
-  plugins.init(connectionString, seedPath)
+  plugins.init(psqlUrl, seedPath)
 
   lamassuConfig.load(function (err, config) {
     if (err) {

migrations/db.js

@@ -2,7 +2,12 @@
 
 var pg = require('pg');
 var async   = require('async');
-var psqlUrl = require('../lib/options').postgres
+var psqlUrl = require('../lib/options').postgresql
+
+if (psqlUrl) {
+  console.log('No postgresql entry in config file')
+  process.exit(1)
+}
 
 exports.query = function query(sql, cb) {
   exports.multi([sql], cb);