techhub/mastodon
2
0
Fork 0
Code Activity

Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)

Browse Source 
Since 872a0d5bd8, assets URL are absolute and
not relative. Unfortunately, the domain used to build such URLs is the wrong
one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.
This commit is contained in:
ThibG
2018-01-21 13:22:31 +01:00
committed by Eugen Rochko
parent 112b1fa265
commit d613dda91d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/webpack/configuration.js
View File

@@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') {
const output = { const output = {
path: resolve('public', settings.public_output_path), path: resolve('public', settings.public_output_path),
publicPath: formatPublicPath(env.ASSET_HOST || env.LOCAL_DOMAIN, settings.public_output_path), publicPath: formatPublicPath(env.ASSET_HOST || env.WEB_DOMAIN || env.LOCAL_DOMAIN, settings.public_output_path),
}; };
module.exports = { module.exports = {