diff --git a/core/boot.js b/core/boot.js index addc958782..4e96d793e9 100644 --- a/core/boot.js +++ b/core/boot.js @@ -112,10 +112,10 @@ async function initCore({ghostServer, config}) { async function initFrontend() { debug('Begin: initFrontend'); - debug('Begin: Frontend Settings'); - const frontendSettings = require('./frontend/services/settings'); - await frontendSettings.init(); - debug('End: Frontend Settings'); + debug('Begin: Frontend Routing Settings'); + const routeSettings = require('./server/services/route-settings'); + await routeSettings.init(); + debug('End: Frontend Routing Settings'); debug('Begin: Themes'); const themeService = require('./server/services/themes'); diff --git a/core/frontend/services/settings/index.js b/core/frontend/services/settings/index.js index aa4736ed59..890da53d66 100644 --- a/core/frontend/services/settings/index.js +++ b/core/frontend/services/settings/index.js @@ -1,7 +1,5 @@ const crypto = require('crypto'); -const debug = require('@tryghost/debug')('frontend:services:settings:index'); const SettingsLoader = require('./loader'); -const ensureSettingsFile = require('./ensure-settings'); /** * md5 hashes of default routes settings @@ -15,14 +13,6 @@ const calculateHash = (data) => { }; module.exports = { - init: function () { - debug('init routes settings service'); - - // Make sure that supported settings files are available - // inside of the `content/setting` directory - return ensureSettingsFile('routes.yaml'); - }, - /** * Getter for routes YAML setting. * Example: `settings.get().then(...)` diff --git a/core/frontend/services/settings/ensure-settings.js b/core/server/services/route-settings/ensure-settings.js similarity index 100% rename from core/frontend/services/settings/ensure-settings.js rename to core/server/services/route-settings/ensure-settings.js diff --git a/core/server/services/route-settings/route-settings.js b/core/server/services/route-settings/route-settings.js index b0679329c7..95360e7fc2 100644 --- a/core/server/services/route-settings/route-settings.js +++ b/core/server/services/route-settings/route-settings.js @@ -9,6 +9,7 @@ const errors = require('@tryghost/errors'); const tpl = require('@tryghost/tpl'); const config = require('../../../shared/config'); const bridge = require('../../../bridge'); +const ensureSettingsFile = require('./ensure-settings'); const messages = { loadError: 'Could not load {filename} file.' @@ -134,5 +135,14 @@ const get = async () => { return readFile(settingsFilePath); }; +const init = function () { + debug('init routes settings service'); + + // Make sure that supported settings files are available + // inside of the `content/setting` directory + return ensureSettingsFile('routes.yaml'); +}; + module.exports.setFromFilePath = setFromFilePath; module.exports.get = get; +module.exports.init = init; diff --git a/test/unit/services/settings/ensure-settings.test.js b/test/unit/services/settings/ensure-settings.test.js index 22ab690bb5..c64b6d00fa 100644 --- a/test/unit/services/settings/ensure-settings.test.js +++ b/test/unit/services/settings/ensure-settings.test.js @@ -3,7 +3,7 @@ const should = require('should'); const fs = require('fs-extra'); const path = require('path'); const configUtils = require('../../../utils/configUtils'); -const ensureSettings = require('../../../../core/frontend/services/settings/ensure-settings'); +const ensureSettings = require('../../../../core/server/services/route-settings/ensure-settings'); describe('UNIT > Settings Service ensure settings:', function () { beforeEach(function () { diff --git a/test/utils/acceptance-utils.js b/test/utils/acceptance-utils.js index 59370a81a7..b84951f8bf 100644 --- a/test/utils/acceptance-utils.js +++ b/test/utils/acceptance-utils.js @@ -16,7 +16,7 @@ const db = require('../../core/server/data/db'); const models = require('../../core/server/models'); const urlService = require('../../core/frontend/services/url'); const settingsService = require('../../core/server/services/settings'); -const frontendSettingsService = require('../../core/frontend/services/settings'); +const routeSettingsService = require('../../core/server/services/route-settings'); const web = require('../../core/server/web'); const themeService = require('../../core/server/services/themes'); const limits = require('../../core/server/services/limits'); @@ -109,8 +109,8 @@ const restartModeGhostStart = async () => { await settingsService.init(); debug('settings done'); - // Reload the frontend - await frontendSettingsService.init(); + // Load the frontend-related components + await routeSettingsService.init(); await themeService.init(); debug('frontend done');