Merge branch 'dev' into feat-dockerize-l-s

bin/convert-txs.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 var pgp = require('pg-promise')()
 

bin/lamassu-configure-frontcamera

@@ -3,7 +3,7 @@
 'use strict'
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 const setEnvVariable = require('../tools/set-env-var')
 

bin/lamassu-eth-recovery

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 const hdkey = require('ethereumjs-wallet/hdkey')
 const hkdf = require('futoin-hkdf')
 const db = require('../lib/db')

bin/lamassu-migrate

@@ -3,6 +3,10 @@ const _ = require('lodash/fp')
 const path = require('path')
 require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
 
+const _ = require('lodash/fp')
+const path = require('path')
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
+
 const db = require('../lib/db')
 const migrate = require('../lib/migrate')
 const { asyncLocalStorage, defaultStore } = require('../lib/async-storage')

bin/lamassu-mnemonic

@@ -2,7 +2,7 @@
 
 const fs = require('fs')
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 const MNEMONIC_PATH = process.env.MNEMONIC_PATH
 

bin/lamassu-ofac-update-sources

@@ -5,7 +5,7 @@
 const setEnvVariable = require('../tools/set-env-var')
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 if (!process.env.OFAC_SOURCES_NAMES && !process.env.OFAC_SOURCES_URLS) {
   setEnvVariable('OFAC_SOURCES_NAMES', 'sdn_advanced,cons_advanced')

bin/lamassu-operator

@@ -4,7 +4,7 @@ const fs = require('fs')
 const hkdf = require('futoin-hkdf')
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 const mnemonicHelpers = require('../lib/mnemonic-helpers')
 

bin/lamassu-register

@@ -1,14 +1,14 @@
 #!/usr/bin/env node
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 const { asyncLocalStorage, defaultStore } = require('../lib/async-storage')
 const userManagement = require('../lib/new-admin/graphql/modules/userManagement')
 const authErrors = require('../lib/new-admin/graphql/errors/authentication')
 
 const name = process.argv[2]
 const role = process.argv[3]
-const domain = process.env.LAMASSU_ADMIN_SERVER_IP || process.env.HOSTNAME
+const domain = process.env.HOSTNAME
 
 if (!domain) {
   console.error('No hostname configured in the environment')

bin/lamassu-update-to-mnemonic

@@ -9,7 +9,7 @@ const mnemonicHelpers = require('../lib/mnemonic-helpers')
 const setEnvVariable = require('../tools/set-env-var')
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 if (!process.env.MNEMONIC_PATH && process.env.SEED_PATH) {
   const seed = fs.readFileSync(process.env.SEED_PATH, 'utf8').trim()

bin/migrate-config.js

@@ -5,7 +5,7 @@
 const pgp = require('pg-promise')()
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 const { PSQL_URL } = require('../lib/constants')
 

bin/old-lamassu-register

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '../.env') })
+require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve(os.homedir(), '.lamassu', '.env') : path.resolve(__dirname, '../.env') })
 
 const login = require('../lib/admin/login')