Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-28 01:21:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: regression caused by 94b79ce402

Browse Source 
`./nodebb setup` was no longer able to be called without arguments or env vars
This commit is contained in:
Julian Lam
2022-02-17 12:30:03 -05:00
parent 3acd2ac850
commit 4164898d85
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/install.js
View File

@@ -47,7 +47,7 @@ questions.optional = [
]; ];
function checkSetupFlagEnv() { function checkSetupFlagEnv() {
let setupVal = install.values || {}; let setupVal = install.values;
const envConfMap = { const envConfMap = {
NODEBB_URL: 'url', NODEBB_URL: 'url',
@@ -65,17 +65,21 @@ function checkSetupFlagEnv() {
}; };
// Set setup values from env vars (if set) // Set setup values from env vars (if set)
winston.info('[install/checkSetupFlagEnv] checking env vars for setup info...'); const envKeys = Object.keys(process.env);
if (Object.keys(envConfMap).some(key => envKeys.includes(key))) {
winston.info('[install/checkSetupFlagEnv] checking env vars for setup info...');
setupVal = setupVal || {};
Object.entries(process.env).forEach(([evName, evValue]) => { // get setup values from env Object.entries(process.env).forEach(([evName, evValue]) => { // get setup values from env
if (evName.startsWith('NODEBB_DB_')) { if (evName.startsWith('NODEBB_DB_')) {
setupVal[`${process.env.NODEBB_DB}:${envConfMap[evName]}`] = evValue; setupVal[`${process.env.NODEBB_DB}:${envConfMap[evName]}`] = evValue;
} else if (evName.startsWith('NODEBB_')) { } else if (evName.startsWith('NODEBB_')) {
setupVal[envConfMap[evName]] = evValue; setupVal[envConfMap[evName]] = evValue;
} }
}); });
setupVal['admin:password:confirm'] = setupVal['admin:password']; setupVal['admin:password:confirm'] = setupVal['admin:password'];
}
// try to get setup values from json, if successful this overwrites all values set by env // try to get setup values from json, if successful this overwrites all values set by env
// TODO: better behaviour would be to support overrides per value, i.e. in order of priority (generic pattern): // TODO: better behaviour would be to support overrides per value, i.e. in order of priority (generic pattern):