diff --git a/src/install.js b/src/install.js index b8a35fa572..851932d0a4 100644 --- a/src/install.js +++ b/src/install.js @@ -241,30 +241,29 @@ function setupDatabase(server_conf, next) { function setupDefaultConfigs(next) { winston.info('Populating database with default configs, if not already set...'); - var meta = require('./meta'); - - fs.readFile(path.join(__dirname, '../', 'install/data/defaults.json'), function (err, defaults) { - async.each(defaults, function (configObj, next) { - meta.configs.setOnEmpty(configObj.field, configObj.value, next); - }, function (err) { - meta.configs.init(next); - }); - - if (install.values) { - 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: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']); - } - } + 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); + }, function (err) { + meta.configs.init(next); }); + + if (install.values) { + 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: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']); + } + } } function enableDefaultTheme(next) {