interim commit -- enabling default plugins on setup

v1.18.x
Julian Lam 12 years ago
parent 87abe426d8
commit 995fa7d6fd

@ -7,6 +7,7 @@ var async = require('async'),
User = require('./user'), User = require('./user'),
Groups = require('./groups'), Groups = require('./groups'),
Categories = require('./categories'), Categories = require('./categories'),
Plugins = require('./plugins'),
prompt = require('prompt'), prompt = require('prompt'),
admin = { admin = {
categories: require('./admin/categories') categories: require('./admin/categories')
@ -63,10 +64,7 @@ var async = require('async'),
prompt.delimiter = ''; prompt.delimiter = '';
prompt.get(install.questions, function(err, config) { prompt.get(install.questions, function(err, config) {
if (!config) { if (!config) return next(new Error('aborted'));
winston.warn('NodeBB Setup Aborted.');
process.exit();
}
// Translate redis properties into redis object // Translate redis properties into redis object
config.redis = { config.redis = {
@ -146,8 +144,30 @@ var async = require('async'),
next(); 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) { createAdmin: function(callback) {
winston.warn('No administrators have been detected, running initial user setup'); 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) { prompt.get(questions, function(err, results) {
if (!results) return callback(new Error('aborted'));
nconf.set('bcrypt_rounds', 12); nconf.set('bcrypt_rounds', 12);
User.create(results.username, results.password, results.email, function(err, uid) { User.create(results.username, results.password, results.email, function(err, uid) {
Groups.getGidFromName('Administrators', function(err, gid) { Groups.getGidFromName('Administrators', function(err, gid) {

@ -162,10 +162,12 @@ var fs = require('fs'),
return; return;
} }
callback({ if (callback) {
id: id, callback({
active: !active id: id,
}); active: !active
});
}
}); });
}); });
}, },

Loading…
Cancel
Save