about summary refs log tree commit diff
path: root/config/initializers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-11-06 20:43:16 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-11-06 20:43:16 +0100
commitd14967e1c825eae1288c7a5bb1a30f49f174f857 (patch)
tree3750d94275b1393d378ee48bdd8c8b7411f3b505 /config/initializers
parent45230c56ab10cd40d7a2e6e241dd30ae4e40e6b0 (diff)
Fix URL configuration when S3 is enabled
Diffstat (limited to 'config/initializers')
-rw-r--r--config/initializers/ostatus.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 72009334f..383253cd4 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 }