Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

🎨 adapt bootstrap file because of nconf changes

Browse source 
refs #6982
- remove load config
- remove checkDeprecated
- adapt arguments for scheduling init

[ci skip]
This commit is contained in:
kirrg001 2016-09-13 21:38:16 +02:00 committed by Hannah Wolfe
parent 042e0da1c9
commit 248ceba72b
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/server/index.js
View file

@ -14,7 +14,6 @@ require('./overrides');
// Module dependencies
var express = require('express'),
_ = require('lodash'),
uuid = require('node-uuid'),
Promise = require('bluebird'),
i18n = require('./i18n'),
@ -73,15 +72,8 @@ function init(options) {
// Initialize Internationalization
i18n.init();
// Load our config.js file from the local file system.
return config.load(options.config).then(function () {
return config.checkDeprecated();
}).then(function loadApps() {
return readDirectory(config.get('paths').appPath)
.then(function (result) {
config.set('paths:availableApps', result);
});
}).then(function loadThemes() {
return readDirectory(config.get('paths').appPath).then(function loadThemes(result) {
config.set('paths:availableApps', result);
return api.themes.loadThemes();
}).then(function () {
models.init();
@ -169,7 +161,11 @@ function init(options) {
// scheduling can trigger api requests, that's why we initialize the module after the ghost server creation
// scheduling module can create x schedulers with different adapters
return scheduling.init(_.extend(config.get('scheduling'), {apiUrl: utils.url.apiUrl()}));
return scheduling.init({
active: config.get('scheduling').active,
path: config.get('paths').schedulingPath,
apiUrl: utils.url.apiUrl()
});
}).then(function () {
return ghostServer;
});