logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: d613dda91d1f1595f73a967eb01c41b07cddacbe
parent: 112b1fa265f650c01eef2578e286214e3d82dcac
Author: ThibG <thib@sitedethib.com>
Date:   Sun, 21 Jan 2018 13:22:31 +0100

Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)

Since 872a0d5bd801c998d911f7da582a60d2f714a710, 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.

Diffstat:

Mconfig/webpack/configuration.js2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js @@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') { const output = { 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 = {