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

closes #3176

Browse Source
This commit is contained in:
barisusakli
2015-05-23 22:11:20 -04:00
parent 9ed88b7bb9
commit 714c7356f9
2 changed files with 55 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/install.js
View File

@@ -239,24 +239,39 @@ function setupDefaultConfigs(next) {
var meta = require('./meta'),
defaults = require(path.join(__dirname, '../', 'install/data/defaults.json'));
async.each(defaults, function (configObj, next) {
meta.configs.setOnEmpty(configObj.field, configObj.value, next);
async.each(Object.keys(defaults), function (key, next) {
meta.configs.setOnEmpty(key, defaults[key], next);
}, function (err) {
meta.configs.init(next);
});
if (err) {
return next(err);
}
if (install.values) {
setIfPaired('social:twitter:key', 'social:twitter:secret');
setIfPaired('social:google:id', 'social:google:secret');
setIfPaired('social:facebook:app_id', 'social:facebook:secret');
}
if (install.values) {
async.parallel([
async.apply(setIfPaired, 'social:twitter:key', 'social:twitter:secret'),
async.apply(setIfPaired, 'social:google:id', 'social:google:secret'),
async.apply(setIfPaired, 'social:facebook:app_id', 'social:facebook:secret')
], function(err) {
if (err) {
return next(err);
}
meta.configs.init(next);
});
} else {
meta.configs.init(next);
}
});
}
function setIfPaired(key1, key2) {
function setIfPaired(key1, key2, callback) {
var meta = require('./meta');
if (install.values[key1] && install.values[key2]) {
meta.configs.setOnEmpty(key1, install.values[key1]);
meta.configs.setOnEmpty(key2, install.values[key2]);
async.parallel([
async.apply(meta.configs.setOnEmpty, key1, install.values[key1]),
async.apply(meta.configs.setOnEmpty, key2, install.values[key2])
], callback);
} else {
callback();
}
}