scalie-business
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Eugen Rochko 2018-01-29 01:06:39 +01:00 committed by GitHub
parent 79bc3d5845
commit 97dcfb0f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats 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, settings.public_output_path), publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
}; };
module.exports = { module.exports = {

2
lib/mastodon/premailer_webpack_strategy.rb
View File

@ -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}"