Skip to content
Snippets Groups Projects
Unverified Commit 97dcfb0f authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)

parent 79bc3d58
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config/webpack/configuration.js
+ 1
− 1
View file @ 97dcfb0f
...@@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') { ...@@ -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, settings.public_output_path), publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
}; };
module.exports = { module.exports = {
......
lib/mastodon/premailer_webpack_strategy.rb
+ 1
− 1
View file @ 97dcfb0f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
module PremailerWebpackStrategy module PremailerWebpackStrategy
def load(url) def load(url)
asset_host = ENV['ASSET_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN'] asset_host = ENV['CDN_HOST'] || ENV['WEB_DOMAIN'] || ENV['LOCAL_DOMAIN']
if Webpacker.dev_server.running? if Webpacker.dev_server.running?
asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}" asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment