Skip to content

Commit

Permalink
🎨 adapt bootstrap file because of nconf changes
Browse files Browse the repository at this point in the history
refs #6982
- remove load config
- remove checkDeprecated
- adapt arguments for scheduling init

[ci skip]
  • Loading branch information
kirrg001 authored and ErisDS committed Sep 20, 2016
1 parent 042e0da commit 248ceba
Showing 1 changed file with 7 additions and 11 deletions.
18 changes: 7 additions & 11 deletions core/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ require('./overrides');

// Module dependencies
var express = require('express'),
_ = require('lodash'),
uuid = require('node-uuid'),
Promise = require('bluebird'),
i18n = require('./i18n'),
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
});
Expand Down

0 comments on commit 248ceba

Please sign in to comment.