From 220a68fcfa073c0442e65259eb66c6771b14a098 Mon Sep 17 00:00:00 2001
From: Josh Harvey <josh@lamassu.is>
Date: Sun, 12 Jun 2016 17:53:23 +0300
Subject: [PATCH] config fixes

---
 bin/convert-txs.js | 2 +-
 bin/ssu            | 2 +-
 bin/ssu-raqia      | 2 +-
 lib/app.js         | 3 +--
 migrations/db.js   | 7 ++++++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/convert-txs.js b/bin/convert-txs.js
index ed23a941..f8504fc6 100755
--- a/bin/convert-txs.js
+++ b/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)
 
diff --git a/bin/ssu b/bin/ssu
index 12cfeb8b..c0c4052c 100755
--- a/bin/ssu
+++ b/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]
 
diff --git a/bin/ssu-raqia b/bin/ssu-raqia
index fdbec54e..ba6dda56 100644
--- a/bin/ssu-raqia
+++ b/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');
 
diff --git a/lib/app.js b/lib/app.js
index 37203601..64ea44eb 100644
--- a/lib/app.js
+++ b/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) {
diff --git a/migrations/db.js b/migrations/db.js
index e69f4152..31308354 100644
--- a/migrations/db.js
+++ b/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);