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

Merge pull request #1214 from chaotixkilla/fix-prod-environment-file-path

Browse source 
Fix .env path on production environments
This commit is contained in:
Rafael Taranto 2022-05-18 07:29:32 +01:00 • committed by GitHub
commit 6cabf7b412
21 changed files with 24 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/app.js
View file

@ -1,12 +1,9 @@
const fs = require('fs')
const path = require('path')
const http = require('http')
const https = require('https')
const argv = require('minimist')(process.argv.slice(2))
const os = require('os')
require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
require('./environment-helper')
const { asyncLocalStorage, defaultStore } = require('./async-storage')
const routes = require('./routes')
const logger = require('./logger')

2
lib/environment-helper.js Normal file
View file

@ -0,0 +1,2 @@
const path = require('path')
require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve('/etc', 'lamassu', '.env') : path.resolve(__dirname, '../.env') })

2
lib/migrate-options.js
View file

@ -57,7 +57,7 @@ function updateOptionBasepath (result, optionName) {
async function run () {
// load current opts
const options = load().opts
const shouldMigrate = !fs.existsSync(process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env'))
const shouldMigrate = !fs.existsSync(process.env.NODE_ENV === 'production' ? path.resolve('/etc', 'lamassu', '.env') : path.resolve(__dirname, '../.env'))
// write the resulting .env
if (shouldMigrate) {

5
lib/new-admin/admin-server.js
View file

@ -10,11 +10,8 @@ const nocache = require('nocache')
const cookieParser = require('cookie-parser')
const { graphqlUploadExpress } = require('graphql-upload')
const { ApolloServer } = require('apollo-server-express')
const _ = require('lodash/fp')
const os = require('os')
require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../../.env') })
require('../environment-helper')
const { asyncLocalStorage, defaultStore } = require('../async-storage')
const logger = require('../logger')

5
lib/new-admin/graphql-dev-insecure.js
View file

@ -1,10 +1,7 @@
const express = require('express')
const path = require('path')
const { ApolloServer } = require('apollo-server-express')
const os = require('os')
require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../../.env') })
require('../environment-helper')
const { typeDefs, resolvers } = require('./graphql/schema')
const logger = require('../logger')

2
lib/options-loader.js
View file

@ -4,7 +4,7 @@ const os = require('os')
const argv = require('minimist')(process.argv.slice(2))
const _ = require('lodash/fp')
require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
require('./environment-helper')
const DATABASE = process.env.LAMASSU_DB ?? 'PROD'
const dbMapping = psqlConf => ({