yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-09 14:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge admin config into strapic config

Browse Source
This commit is contained in:
Alexandre Bodin 2021-08-03 08:33:47 +02:00
parent d44a6f68ee
commit a0011840e8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/getstarted/config/server.js
View File

@ -2,6 +2,7 @@ module.exports = ({ env }) => ({
host: env('HOST', '0.0.0.0'), host: env('HOST', '0.0.0.0'),
port: env.int('PORT', 1337), port: env.int('PORT', 1337),
admin: { admin: {
autoOpen: true,
auth: { auth: {
secret: env('ADMIN_JWT_SECRET', 'example-token'), secret: env('ADMIN_JWT_SECRET', 'example-token'),
}, },

5
packages/core/strapi/lib/Strapi.js
View File

@ -327,6 +327,11 @@ class Strapi {
const modules = await loadModules(this); const modules = await loadModules(this);
this.admin = require('@strapi/admin/strapi-server'); this.admin = require('@strapi/admin/strapi-server');
// TODO: rename into just admin and ./config/admin.js
const userAdminConfig = strapi.config.get('server.admin');
this.config.set('server.admin', _.merge(this.admin.config, userAdminConfig));
this.api = modules.api; this.api = modules.api;
this.components = modules.components; this.components = modules.components;
this.plugins = modules.plugins; this.plugins = modules.plugins;