hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes #1486

Browse Source
v1.18.x
psychobunny 11 years ago
parent 8fc818e07c
commit 14431f7913
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File

43
src/install.js
Unescape Escape View File

@ -241,30 +241,29 @@ function setupDatabase(server_conf, next) {
function setupDefaultConfigs(next) { function setupDefaultConfigs(next) {
winston.info('Populating database with default configs, if not already set...'); winston.info('Populating database with default configs, if not already set...');
var meta = require('./meta'); var meta = require('./meta'),
defaults = require(path.join(__dirname, '../', 'install/data/defaults.json'));
fs.readFile(path.join(__dirname, '../', 'install/data/defaults.json'), function (err, defaults) {
async.each(defaults, function (configObj, next) { async.each(defaults, function (configObj, next) {
meta.configs.setOnEmpty(configObj.field, configObj.value, next); meta.configs.setOnEmpty(configObj.field, configObj.value, next);
}, function (err) { }, function (err) {
meta.configs.init(next); meta.configs.init(next);
}); });
if (install.values) { if (install.values) {
if (install.values['social:twitter:key'] && install.values['social:twitter:secret']) { if (install.values['social:twitter:key'] && install.values['social:twitter:secret']) {
meta.configs.setOnEmpty('social:twitter:key', install.values['social:twitter:key']); meta.configs.setOnEmpty('social:twitter:key', install.values['social:twitter:key']);
meta.configs.setOnEmpty('social:twitter:secret', install.values['social:twitter:secret']); meta.configs.setOnEmpty('social:twitter:secret', install.values['social:twitter:secret']);
}
if (install.values['social:google:id'] && install.values['social:google:secret']) {
meta.configs.setOnEmpty('social:google:id', install.values['social:google:id']);
meta.configs.setOnEmpty('social:google:secret', install.values['social:google:secret']);
}
if (install.values['social:facebook:key'] && install.values['social:facebook:secret']) {
meta.configs.setOnEmpty('social:facebook:app_id', install.values['social:facebook:app_id']);
meta.configs.setOnEmpty('social:facebook:secret', install.values['social:facebook:secret']);
}
} }
}); if (install.values['social:google:id'] && install.values['social:google:secret']) {
meta.configs.setOnEmpty('social:google:id', install.values['social:google:id']);
meta.configs.setOnEmpty('social:google:secret', install.values['social:google:secret']);
}
if (install.values['social:facebook:key'] && install.values['social:facebook:secret']) {
meta.configs.setOnEmpty('social:facebook:app_id', install.values['social:facebook:app_id']);
meta.configs.setOnEmpty('social:facebook:secret', install.values['social:facebook:secret']);
}
}
} }
function enableDefaultTheme(next) { function enableDefaultTheme(next) {

Write Preview
Loading…
Cancel
Save