Browse Source

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

pull/4/head
Eugen Rochko 6 years ago
committed by GitHub
parent
commit
97dcfb0f50
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      config/webpack/configuration.js
  2. +1
    -1
      lib/mastodon/premailer_webpack_strategy.rb

+ 1
- 1
config/webpack/configuration.js View File

@ -27,7 +27,7 @@ function formatPublicPath(host = '', path = '') {
const output = {
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 = {

+ 1
- 1
lib/mastodon/premailer_webpack_strategy.rb View File

@ -2,7 +2,7 @@
module PremailerWebpackStrategy
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?
asset_host = "#{Webpacker.dev_server.protocol}://#{Webpacker.dev_server.host_with_port}"

Loading…
Cancel
Save