mastofe

commit: 97dcfb0f5025275d67459ab2c6d41f0affd8a493
parent: 79bc3d58456a850a7f2d99a2c0e15ff1618c1a0e
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Mon, 29 Jan 2018 01:06:39 +0100

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


Diffstat:
M
config/webpack/configuration.js
2
+-
M
lib/mastodon/premailer_webpack_strategy.rb
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
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, settings.public_output_path),
+  publicPath: formatPublicPath(env.CDN_HOST, settings.public_output_path),
 };
 
 module.exports = {
diff --git a/lib/mastodon/premailer_webpack_strategy.rb b/lib/mastodon/premailer_webpack_strategy.rb
@@ -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}"