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

Merge branch 'dbal' of github.com:designcreateplay/NodeBB into dbal

Browse Source
This commit is contained in:
Julian Lam
2013-12-07 13:12:07 -05:00
parent aaaffb823f 90a75ee045
commit 4fd08332cc
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/database.js
View File

@@ -5,7 +5,7 @@ var nconf = require('nconf'),
winston = require('winston');
if(!databaseType) {
winston.info('Database type not set! Run npm app --setup');
winston.info('Database type not set! Run node app --setup');
process.exit();
}

12
src/install.js
View File

@@ -110,7 +110,7 @@ var async = require('async'),
}
function dbQuestionsSuccess(err, databaseConfig) {
if (!config) {
if (!databaseConfig) {
return next(new Error('aborted'));
}
@@ -129,9 +129,10 @@ var async = require('async'),
password: databaseConfig['mongo:password'],
database: databaseConfig['mongo:database']
};
} else {
return next(new Error('unknown database : ' + config.database));
}
// Add hardcoded values
config.bcrypt_rounds = 12;
config.upload_path = '/public/uploads';
config.use_port = (config.use_port.slice(0, 1) === 'y') ? true : false;
@@ -153,10 +154,13 @@ var async = require('async'),
});
}
if(config.database === 'redis')
if(config.database === 'redis') {
prompt.get(install.redisQuestions, dbQuestionsSuccess);
else if(config.database === 'mongo')
} else if(config.database === 'mongo') {
prompt.get(install.mongoQuestions, dbQuestionsSuccess);
} else {
return next(new Error('unknown database : ' + config.database));
}
};
// prompt prepends "prompt: " to questions, let's clear that.