mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 02:55:58 +01:00 
			
		
		
		
	interim commit -- enabling default plugins on setup
This commit is contained in:
		| @@ -7,6 +7,7 @@ var	async = require('async'), | ||||
| 	User = require('./user'), | ||||
| 	Groups = require('./groups'), | ||||
| 	Categories = require('./categories'), | ||||
| 	Plugins = require('./plugins'), | ||||
| 	prompt = require('prompt'), | ||||
| 	admin = { | ||||
| 		categories: require('./admin/categories') | ||||
| @@ -63,10 +64,7 @@ var	async = require('async'), | ||||
| 					prompt.delimiter = ''; | ||||
|  | ||||
| 					prompt.get(install.questions, function(err, config) { | ||||
| 						if (!config) { | ||||
| 							winston.warn('NodeBB Setup Aborted.'); | ||||
| 							process.exit(); | ||||
| 						} | ||||
| 						if (!config) return next(new Error('aborted')); | ||||
|  | ||||
| 						// Translate redis properties into redis object | ||||
| 						config.redis = { | ||||
| @@ -146,8 +144,30 @@ var	async = require('async'), | ||||
| 							next(); | ||||
| 						} | ||||
| 					}); | ||||
| 				}, | ||||
| 				function(next) { | ||||
| 					// Default plugins | ||||
| 					winston.info('Enabling default plugins'); | ||||
|  | ||||
| 					var	defaultEnabled = [ | ||||
| 							'nodebb-plugin-markdown', 'nodebb-plugin-mentions' | ||||
| 						]; | ||||
|  | ||||
| 					async.each(defaultEnabled, function(pluginId, next) { | ||||
| 						Plugins.isActive(pluginId, function(err, active) { | ||||
| 							if (!active) { | ||||
| 								Plugins.toggleActive(pluginId); | ||||
| 								next(); | ||||
| 							} else next(); | ||||
| 						}) | ||||
| 					}, next); | ||||
| 				} | ||||
| 			], callback); | ||||
| 			], function(err) { | ||||
| 				if (err) { | ||||
| 					winston.warn('NodeBB Setup Aborted.'); | ||||
| 					process.exit(); | ||||
| 				} else callback(); | ||||
| 			}); | ||||
| 		}, | ||||
| 		createAdmin: function(callback) { | ||||
| 			winston.warn('No administrators have been detected, running initial user setup'); | ||||
| @@ -174,6 +194,8 @@ var	async = require('async'), | ||||
| 				]; | ||||
|  | ||||
| 			prompt.get(questions, function(err, results) { | ||||
| 				if (!results) return callback(new Error('aborted')); | ||||
|  | ||||
| 				nconf.set('bcrypt_rounds', 12); | ||||
| 				User.create(results.username, results.password, results.email, function(err, uid) { | ||||
| 					Groups.getGidFromName('Administrators', function(err, gid) { | ||||
|   | ||||
| @@ -162,10 +162,12 @@ var	fs = require('fs'), | ||||
| 						return; | ||||
| 					} | ||||
|  | ||||
| 					callback({ | ||||
| 						id: id, | ||||
| 						active: !active | ||||
| 					}); | ||||
| 					if (callback) { | ||||
| 						callback({ | ||||
| 							id: id, | ||||
| 							active: !active | ||||
| 						}); | ||||
| 					} | ||||
| 				}); | ||||
| 			}); | ||||
| 		}, | ||||
|   | ||||
		Reference in New Issue
	
	Block a user