TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 12:53:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1813 from ErisDS/path-change

Browse Source 
Move config path.update to config.load
This commit is contained in:
Hannah Wolfe 2014-01-02 13:01:14 -08:00
commit 75b261cd69
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/server/config/index.js
View File

@ -21,9 +21,13 @@ function loadConfig() {
return loader().then(function (config) {
// Cache the config.js object's environment
// object so we can later refer to it.
// Note: this is not the entirity of config.js,
// Note: this is not the entirety of config.js,
// just the object appropriate for this NODE_ENV
ghostConfig = config;
// can't load theme settings yet as we don't have the API,
// but we can load the paths
return paths.update(config.url);
});
}

9
core/server/index.js
View File

@ -87,12 +87,9 @@ function setup(server) {
Polyglot.instance = new Polyglot();
// ### Initialisation
when.join(
// Initialise the models
models.init(),
// Calculate paths
config.paths.update(config().url)
).then(function () {
// Initialise the models
models.init().then(function () {
// Populate any missing default settings
return models.Settings.populateDefaults();
}).then(function () {