Fix URL configuration when S3 is enabled

diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 101382604431eeca3418409d6e3c44fe8f7d3f2d..0512a4e0ac88e94a318c888fa61f3bb4cb11fef4 100644 (file)
--- a/app/helpers/routing_helper.rb
+++ b/app/helpers/routing_helper.rb
@@ -10,6 +10,6 @@ module RoutingHelper
   end
 
   def full_asset_url(source)
-    File.join(root_url, ActionController::Base.helpers.asset_url(source))
+    Rails.configuration.x.use_s3 ? source : File.join(root_url, ActionController::Base.helpers.asset_url(source))
   end
 end

diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 72009334fcff8c9a3317eba226155b8de8b651e4..383253cd4b83d7818d224b8bbd5bb198036c4a81 100644 (file)
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -2,6 +2,7 @@ Rails.application.configure do
   config.x.local_domain = ENV['LOCAL_DOMAIN'] || "localhost:#{ENV['PORT'] || 3000}"
   config.x.hub_url      = ENV['HUB_URL']      || 'https://pubsubhubbub.superfeedr.com'
   config.x.use_https    = ENV['LOCAL_HTTPS'] == 'true'
+  config.x.use_s3       = ENV['S3_ENABLED'] == 'true'
 
   config.action_mailer.default_url_options = { host: config.x.local_domain, protocol: config.x.use_https ? 'https://' : 'http://', trailing_slash: false }