yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-23 15:29:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 3.0.0-alpha.14.1

Browse Source
This commit is contained in:
Jim LAURIE 2018-09-13 14:51:31 +02:00 committed by GitHub
commit 44daf8d962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi/lib/core/configurations.js
View File

@ -331,7 +331,7 @@ module.exports.app = async function() {
`${this.config.url}/${get(this.config.currentEnvironment.server, 'admin.path', 'admin')}`;
// proxy settings
this.config.proxy = get(this.config.currentEnvironment, 'server.proxy' || {});
this.config.proxy = get(this.config.currentEnvironment, 'server.proxy', {});
// check if SSL enabled and construct proxy url
function getProxyUrl(ssl, url) {