Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

should close #634

Browse Source
This commit is contained in:
akhoury
2013-12-08 11:59:48 -05:00
parent 7fa2f474fe
commit 2d4ceb8f9f
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/install.js
View File

@@ -104,12 +104,12 @@ var async = require('async'),
}
},
function (next) {
var success = function(err, config) {
var success = function (err, config) {
if (!config) {
return next(new Error('aborted'));
}
function dbQuestionsSuccess(err, databaseConfig) {
var dbQuestionsSuccess = function (err, databaseConfig) {
if (!databaseConfig) {
return next(new Error('aborted'));
}
@@ -135,7 +135,7 @@ var async = require('async'),
config.bcrypt_rounds = 12;
config.upload_path = '/public/uploads';
config.use_port = (config.use_port.slice(0, 1) === 'y') ? true : false;
config.use_port = config.use_port.slice(0, 1) === 'y';
var urlObject = url.parse(config.base_url),
relative_path = (urlObject.pathname && urlObject.pathname.length > 1) ? urlObject.pathname : '',
@@ -152,12 +152,20 @@ var async = require('async'),
install.save(server_conf, client_conf, function(err) {
require('./database').init(next);
});
}
};
if(config.database === 'redis') {
prompt.get(install.redisQuestions, dbQuestionsSuccess);
if (config['redis:host'] && config['redis:port']) {
dbQuestionsSuccess(null, config);
} else {
prompt.get(install.redisQuestions, dbQuestionsSuccess);
}
} else if(config.database === 'mongo') {
prompt.get(install.mongoQuestions, dbQuestionsSuccess);
if (config['mongo:host'] && config['mongo:port']) {
dbQuestionsSuccess(null, config);
} else {
prompt.get(install.mongoQuestions, dbQuestionsSuccess);
}
} else {
return next(new Error('unknown database : ' + config.database));
}
@@ -173,9 +181,9 @@ var async = require('async'),
} else {
// Use provided values, fall back to defaults
var config = {},
question, x, numQ;
for(x=0,numQ=install.questions.length;x<numQ;x++) {
question = install.questions[x];
question, x, numQ, allQuestions = install.questions.concat(install.redisQuestions).concat(install.mongoQuestions);
for(x=0,numQ=allQuestions.length;x<numQ;x++) {
question = allQuestions[x];
config[question.name] = install.values[question.name] || question['default'] || '';
}
success(null, config);