From a7783947a1ba393b23f30301c2d276e9af4533ef Mon Sep 17 00:00:00 2001 From: MinusGix Date: Sun, 30 Sep 2018 12:50:44 -0500 Subject: Put tripsalt question before password question. --- server/src/managers/config.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'server/src/managers') diff --git a/server/src/managers/config.js b/server/src/managers/config.js index 2865d00..7929641 100644 --- a/server/src/managers/config.js +++ b/server/src/managers/config.js @@ -44,6 +44,13 @@ class ConfigManager { // core server setup questions const questions = { properties: { + tripSalt: { + type: 'string', + required: !currentConfig.tripSalt, + default: currentConfig.tripSalt, + hidden: true, + replace: '*', + }, adminName: { pattern: /^"?[a-zA-Z0-9_]+"?$/, type: 'string', @@ -63,13 +70,6 @@ class ConfigManager { type: 'number', required: !currentConfig.websocketPort, default: currentConfig.websocketPort || 6060 - }, - tripSalt: { - type: 'string', - required: !currentConfig.tripSalt, - default: currentConfig.tripSalt, - hidden: true, - replace: '*', } } }; @@ -100,7 +100,7 @@ class ConfigManager { // trip salt is the last core config question, wait until it's been populated // TODO: update this to work with new plugin support - while(conf === null || typeof conf.tripSalt === 'undefined') { + while(conf === null || typeof conf.websocketPort === 'undefined') { deSync.sleep(100); } @@ -127,10 +127,10 @@ class ConfigManager { ${chalk.white('Note:')} ${chalk.green('npm/yarn run config')} will re-run this utility. You will now be asked for the following: + - ${chalk.magenta(' Salt')}, the salt for username trip - ${chalk.magenta('Admin Name')}, the initial admin username - ${chalk.magenta('Admin Pass')}, the initial admin password - ${chalk.magenta(' Port')}, the port for the websocket - - ${chalk.magenta(' Salt')}, the salt for username trip \u200b `); -- cgit v1.2.1