From d14967e1c825eae1288c7a5bb1a30f49f174f857 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 6 Nov 2016 20:43:16 +0100
Subject: [PATCH] Fix URL configuration when S3 is enabled
---
app/helpers/routing_helper.rb | 2 +-
config/initializers/ostatus.rb | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/helpers/routing_helper.rb b/app/helpers/routing_helper.rb
index 1013826044..0512a4e0ac 100644
--- 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 72009334fc..383253cd4b 100644
--- 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 }