lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add support for user .lamassu dir

Browse source
This commit is contained in:
Josh Harvey 2016-06-12 12:37:32 +03:00
parent 08c03d029c
commit 944de6fab0
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bin/lamassu-server
View file

@ -3,6 +3,8 @@
'use strict' 'use strict'
var fs = require('fs') var fs = require('fs')
const os = require('os')
var path = require('path')
var createServer = require('../lib/app.js') var createServer = require('../lib/app.js')
var argv = require('minimist')(process.argv.slice(2)) var argv = require('minimist')(process.argv.slice(2))
@ -12,9 +14,10 @@ try {
options = JSON.parse(fs.readFileSync('/etc/lamassu.json')) options = JSON.parse(fs.readFileSync('/etc/lamassu.json'))
} catch (err) { } catch (err) {
try { try {
options = JSON.parse(fs.readFileSync('./lamassu.json')) const homePath = path.resolve(os.homedir(), '.lamassu', 'lamassu.json')
options = JSON.parse(fs.readFileSync(homePath))
} catch (err2) { } catch (err2) {
console.log('Missing configuration file /etc/lamassu.json -- exiting.') console.log('Missing configuration file -- exiting.')
process.exit(1) process.exit(1)
} }
} }
@ -22,8 +25,9 @@ try {
process.env.DATABASE_URL = options.postgresql process.env.DATABASE_URL = options.postgresql
var port = process.env.PORT || 3000 var port = process.env.PORT || 3000
var httpOnly = options.httpOnly || argv.http
if (!argv.http) { if (!httpOnly) {
options.https = { options.https = {
key: fs.readFileSync(options.certKeyPath), key: fs.readFileSync(options.certKeyPath),
cert: fs.readFileSync(options.certPath) cert: fs.readFileSync(options.certPath)
@ -36,5 +40,5 @@ var server = createServer(options)
server.listen(port, function () { server.listen(port, function () {
console.log('lamassu-server listening on port ' + port + ' ' + console.log('lamassu-server listening on port ' + port + ' ' +
(argv.http ? '(http)' : '(https)')) (httpOnly ? '(http)' : '(https)'))
}) })