update to latest lamassu.json

bin/lamassu-server

@@ -15,7 +15,7 @@ var httpOnly = options.httpOnly || argv.http
 if (!httpOnly) {
   try {
     options.https = {
-      key: fs.readFileSync(options.certKeyPath),
+      key: fs.readFileSync(options.keyPath),
       cert: fs.readFileSync(options.certPath)
     }
   } catch (err) {

lib/options.js

@@ -1,24 +1,20 @@
-'use strict'
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
 
-var fs = require('fs')
+let serverConfig
-var path = require('path')
-var os = require('os')
-
-var options
-var configPath
 
 try {
-  configPath = '/etc/lamassu.json'
+  const homeConfigPath = path.resolve(os.homedir(), '.lamassu', 'lamassu.json')
-  options = JSON.parse(fs.readFileSync(configPath))
+  serverConfig = JSON.parse(fs.readFileSync(homeConfigPath))
-} catch (err) {
+} catch (_) {
   try {
-    configPath = path.resolve(os.homedir(), '.lamassu', 'lamassu.json')
+    const globalConfigPath = path.resolve('/etc', 'lamassu', 'lamassu.json')
-    console.log(configPath)
+    serverConfig = JSON.parse(fs.readFileSync(globalConfigPath))
-    options = JSON.parse(fs.readFileSync(configPath))
+  } catch (_) {
-  } catch (err2) {
+    console.log("Couldn't open config file.")
-    console.log('Missing configuration file -- exiting.')
     process.exit(1)
   }
 }
 
-module.exports = options
+module.exports = serverConfig

package.json

@@ -42,8 +42,6 @@
   "bin": {
     "lamassu-server": "./bin/lamassu-server",
     "lamassu-migrate": "./bin/lamassu-migrate",
-    "ssu-raqia": "./bin/ssu-raqia",
-    "ssu": "./bin/ssu",
     "hkdf": "./bin/hkdf"
   },
   "scripts": {