diff --git a/lib/environment-helper.js b/lib/environment-helper.js index 6d864390..1abbde13 100644 --- a/lib/environment-helper.js +++ b/lib/environment-helper.js @@ -1,2 +1 @@ -const path = require('path') -require('dotenv').config({ path: process.env.NODE_ENV === 'production' ? path.resolve('/etc', 'lamassu', '.env') : path.resolve(__dirname, '../.env') }) +require('dotenv').config() diff --git a/lib/migrate-options.js b/lib/migrate-options.js index 2ec6f29c..07ba83fb 100644 --- a/lib/migrate-options.js +++ b/lib/migrate-options.js @@ -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('/etc', 'lamassu', '.env') : path.resolve(__dirname, '../.env')) + const shouldMigrate = !fs.existsSync(path.resolve(__dirname, '../.env')) // write the resulting .env if (shouldMigrate) { diff --git a/tools/set-env-var.js b/tools/set-env-var.js index ba736875..8aa5f0d0 100644 --- a/tools/set-env-var.js +++ b/tools/set-env-var.js @@ -3,7 +3,7 @@ const os = require('os') const path = require('path') const setEnvVariable = (key, value) => { - const ENV_PATH = process.env.NODE_ENV === 'production' ? path.resolve('/etc', 'lamassu', '.env') : path.resolve(__dirname, '../.env') + const ENV_PATH = path.resolve(__dirname, '../.env') const ENV_VARIABLES = fs.readFileSync(ENV_PATH, 'utf-8').split(os.EOL) const target = ENV_VARIABLES.indexOf(ENV_VARIABLES.find(line => line.match(new RegExp(`^${key}=`))))