closes #3938

install/databases.js

@@ -1,104 +1,82 @@
 "use strict";
 
-var async = require('async'),
+var async = require('async');
-	prompt = require('prompt'),
+var prompt = require('prompt');
-	nconf = require('nconf'),
+var winston = require('winston');
-	winston = require('winston'),
 
-	questions = {};
+var questions = {
+	redis: require('../src/database/redis').questions,
+	mongo: require('../src/database/mongo').questions
+};
 
-function success(err, config, callback) {
+module.exports = function(config, callback) {
+	async.waterfall([
+		function (next) {
+			process.stdout.write('\n');
+			winston.info('Now configuring ' + config.database + ' database:');
+			getDatabaseConfig(config, next);
+		},
+		function (databaseConfig, next) {
+			saveDatabaseConfig(config, databaseConfig, next);
+		}
+	], callback);
+};
+
+function getDatabaseConfig(config, callback) {
 	if (!config) {
 		return callback(new Error('aborted'));
 	}
 
-	var database = (config.redis || config.mongo) ? config.secondary_database : config.database;
+	if (config.database === 'redis') {
-
-	function dbQuestionsSuccess(err, databaseConfig) {
-		if (!databaseConfig) {
-			return callback(new Error('aborted'));
-		}
-
-		// Translate redis properties into redis object
-		if(database === 'redis') {
-			config.redis = {
-				host: databaseConfig['redis:host'],
-				port: databaseConfig['redis:port'],
-				password: databaseConfig['redis:password'],
-				database: databaseConfig['redis:database']
-			};
-
-			if (config.redis.host.slice(0, 1) === '/') {
-				delete config.redis.port;
-			}
-		} else if (database === 'mongo') {
-			config.mongo = {
-				host: databaseConfig['mongo:host'],
-				port: databaseConfig['mongo:port'],
-				username: databaseConfig['mongo:username'],
-				password: databaseConfig['mongo:password'],
-				database: databaseConfig['mongo:database']
-			};
-		} else {
-			return callback(new Error('unknown database : ' + database));
-		}
-
-		var allQuestions = questions.redis.concat(questions.mongo);
-		for(var x=0;x<allQuestions.length;x++) {
-			delete config[allQuestions[x].name];
-		}
-
-		callback(err, config);
-	}
-
-	if(database === 'redis') {
 		if (config['redis:host'] && config['redis:port']) {
-			dbQuestionsSuccess(null, config);
+			callback(null, config);
 		} else {
-			prompt.get(questions.redis, dbQuestionsSuccess);
+			prompt.get(questions.redis, callback);
 		}
-	} else if(database === 'mongo') {
+	} else if (config.database === 'mongo') {
 		if (config['mongo:host'] && config['mongo:port']) {
-			dbQuestionsSuccess(null, config);
+			callback(null, config);
 		} else {
-			prompt.get(questions.mongo, dbQuestionsSuccess);
+			prompt.get(questions.mongo, callback);
 		}
 	} else {
-		return callback(new Error('unknown database : ' + database));
+		return callback(new Error('unknown database : ' + config.database));
 	}
 }
 
-function getSecondaryDatabaseModules(config, next) {
+function saveDatabaseConfig(config, databaseConfig, callback) {
-	prompt.get({
+	if (!databaseConfig) {
-		"name": "secondary_db_modules",
+		return callback(new Error('aborted'));
-		"description": "Which database modules should " + config.secondary_database + " store?",
+	}
-		"default": nconf.get('secondary_db_modules') || "hash, list, sets, sorted"
-	}, function(err, db) {
-		config.secondary_db_modules = db.secondary_db_modules;
-		success(err, config, next);
-	});
-}
 
-module.exports = function(err, config, databases, callback) {
+	// Translate redis properties into redis object
-	var allowedDBs = Object.keys(databases);
+	if (config.database === 'redis') {
+		config.redis = {
+			host: databaseConfig['redis:host'],
+			port: databaseConfig['redis:port'],
+			password: databaseConfig['redis:password'],
+			database: databaseConfig['redis:database']
+		};
 
-	allowedDBs.forEach(function(db) {
+		if (config.redis.host.slice(0, 1) === '/') {
-		questions[db] = require('./../src/database/' + db).questions;
+			delete config.redis.port;
-	});
-
-	async.waterfall([
-		function(next) {
-			process.stdout.write('\n');
-			winston.info('Now configuring ' + config.database + ' database:');
-			success(err, config, next);
-		},
-		function(config, next) {
-			if (config.secondary_database && allowedDBs.indexOf(config.secondary_database) !== -1) {
-				winston.info('Now configuring ' + config.secondary_database + ' database:');
-				getSecondaryDatabaseModules(config, next);
-			} else {
-				next(err, config);
-			}
 		}
-	], callback);
+	} else if (config.database === 'mongo') {
-};
+		config.mongo = {
+			host: databaseConfig['mongo:host'],
+			port: databaseConfig['mongo:port'],
+			username: databaseConfig['mongo:username'],
+			password: databaseConfig['mongo:password'],
+			database: databaseConfig['mongo:database']
+		};
+	} else {
+		return callback(new Error('unknown database : ' + config.database));
+	}
+
+	var allQuestions = questions.redis.concat(questions.mongo);
+	for (var x=0; x<allQuestions.length; x++) {
+		delete config[allQuestions[x].name];
+	}
+
+	callback(null, config);
+}

package.json

@@ -21,7 +21,9 @@
     "compression": "^1.1.0",
     "connect-ensure-login": "^0.1.1",
     "connect-flash": "^0.1.1",
+    "connect-mongo": "~0.8.2",
     "connect-multiparty": "^2.0.0",
+    "connect-redis": "~2.0.0",
     "cookie-parser": "^1.3.3",
     "cron": "^1.0.5",
     "csurf": "^1.6.1",
@@ -37,6 +39,7 @@
     "mime": "^1.3.4",
     "minimist": "^1.1.1",
     "mkdirp": "~0.5.0",
+    "mongodb": "~2.0.0",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
     "nodebb-plugin-composer-default": "1.0.26",
@@ -56,6 +59,7 @@
     "passport": "^0.3.0",
     "passport-local": "1.0.0",
     "prompt": "^0.2.14",
+    "redis": "~2.4.2",
     "request": "^2.44.0",
     "rimraf": "~2.4.2",
     "rss": "^1.0.0",

src/database.js

@@ -1,56 +1,14 @@
 "use strict";
 
-var nconf = require('nconf'),
+var nconf = require('nconf');
-	primaryDBName = nconf.get('database'),
+var databaseName = nconf.get('database');
-	secondaryDBName = nconf.get('secondary_database'),
+var winston = require('winston');
-	secondaryModules = nconf.get('secondary_db_modules'),
-	winston = require('winston'),
-	async = require('async'),
 
-	ALLOWED_MODULES = ['hash', 'list', 'sets', 'sorted'];
+if (!databaseName) {
-
-if(!primaryDBName) {
 	winston.info('Database type not set! Run ./nodebb setup');
 	process.exit();
 }
 
-function setupSecondaryDB() {
+var primaryDB = require('./database/' + databaseName);
-	var secondaryDB = require('./database/' + secondaryDBName);
-
-	secondaryModules = secondaryModules.split(/,\s*/);
-
-	for (var module in secondaryModules) {
-		if (secondaryModules.hasOwnProperty(module) && ALLOWED_MODULES.indexOf(module) !== -1) {
-			primaryDB[module] = secondaryDB[module];
-		}
-	}
-
-	var primaryDBinit = primaryDB.init,
-		primaryDBclose = primaryDB.close,
-		primaryDBhelpers = primaryDB.helpers;
-
-	primaryDB.init = function(callback) {
-		async.parallel([primaryDBinit, secondaryDB.init], function(err, results) {
-			callback(err);
-		});
-	};
-
-	primaryDB.close = function(callback) {
-		async.parallel([primaryDBclose, secondaryDB.close], function(err, results) {
-			callback(err);
-		});
-	};
-
-	primaryDB.helpers = {};
-	primaryDB.helpers[primaryDBName] = primaryDBhelpers[primaryDBName];
-	primaryDB.helpers[secondaryDBName] = secondaryDB.helpers[secondaryDBName];
-}
-
-
-var primaryDB = require('./database/' + primaryDBName);
-
-if (secondaryDBName && secondaryModules) {
-	setupSecondaryDB();
-}
 
 module.exports = primaryDB;

src/install.js

@@ -6,16 +6,7 @@ var async = require('async'),
 	prompt = require('prompt'),
 	winston = require('winston'),
 	nconf = require('nconf'),
-	utils = require('../public/src/utils.js'),
+	utils = require('../public/src/utils.js');
-
-	DATABASES = {
-		"redis": {
-			"dependencies": ["redis@~2.4.2", "connect-redis@~2.0.0"]
-		},
-		"mongo": {
-			"dependencies": ["mongodb@~2.0.0", "connect-mongo@~0.8.2"]
-		}
-	};
 
 
 var install = {},
@@ -40,7 +31,7 @@ questions.main = [
 	{
 		name: 'database',
 		description: 'Which database to use',
-		'default': nconf.get('database') || 'redis'
+		'default': nconf.get('database') || 'mongo'
 	}
 ];
 
@@ -145,22 +136,9 @@ function setupConfig(next) {
 				process.exit();
 			}
 
-			if (nconf.get('advanced')) {
+			configureDatabases(config, function(err, config) {
-				prompt.get({
+				completeConfigSetup(err, config, next);
-					name: 'secondary_database',
+			});
-					description: 'Select secondary database',
-					'default': nconf.get('secondary_database') || 'none'
-				}, function(err, dbConfig) {
-					config.secondary_database = dbConfig.secondary_database;
-					configureDatabases(err, config, DATABASES, function(err, config) {
-						completeConfigSetup(err, config, next);
-					});
-				});
-			} else {
-				configureDatabases(err, config, DATABASES, function(err, config) {
-					completeConfigSetup(err, config, next);
-				});
-			}
 		});
 	} else {
 		// Use provided values, fall back to defaults
@@ -169,12 +147,11 @@ function setupConfig(next) {
 			mongoQuestions = require('./database/mongo').questions,
 			question, x, numQ, allQuestions = questions.main.concat(questions.optional).concat(redisQuestions).concat(mongoQuestions);
 
-		for(x=0,numQ=allQuestions.length;x<numQ;x++) {
+		allQuestions.forEach(function (question) {
-			question = allQuestions[x];
 			config[question.name] = install.values[question.name] || question['default'] || undefined;
-		}
+		});
 
-		configureDatabases(null, config, DATABASES, function(err, config) {
+		configureDatabases(config, function(err, config) {
 			completeConfigSetup(err, config, next);
 		});
 	}
@@ -200,40 +177,10 @@ function completeConfigSetup(err, config, next) {
 			return next(err);
 		}
 
-		setupDatabase(config, next);
-	});
-}
-
-function setupDatabase(server_conf, next) {
-	install.installDbDependencies(server_conf, function(err) {
-		if (err) {
-			return next(err);
-		}
-
 		require('./database').init(next);
 	});
 }
 
-install.installDbDependencies = function(server_conf, next) {
-	var	npm = require('npm'),
-		packages = [];
-
-	npm.load({}, function(err) {
-		if (err) {
-			return next(err);
-		}
-
-		npm.config.set('spin', false);
-
-		packages = packages.concat(DATABASES[server_conf.database].dependencies);
-		if (server_conf.secondary_database) {
-			packages = packages.concat(DATABASES[server_conf.secondary_database].dependencies);
-		}
-
-		npm.commands.install(packages, next);
-	});
-};
-
 function setupDefaultConfigs(next) {
 	process.stdout.write('Populating database with default configs, if not already set...\n');
 	var meta = require('./meta'),
@@ -457,7 +404,6 @@ function createWelcomePost(next) {
 }
 
 function enableDefaultPlugins(next) {
-	var Plugins = require('./plugins');
 
 	process.stdout.write('Enabling default plugins\n');