about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorImmae <immae@users.noreply.github.com>2017-05-22 15:40:04 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-05-22 15:40:04 +0200
commita94c152fd30cb91c1f4bd9c1e000ea68d0385bfa (patch)
treee97eeb4a3bd504a675fbee0557eb91ab857359ce /config
parent9d04de1c8d3efb745cfcae3519cee016751b86ec (diff)
Allow alternate domains for mastodon handlers (#3187)
Diffstat (limited to 'config')
-rw-r--r--config/initializers/ostatus.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 0c6e88f31..342996dcd 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -5,12 +5,16 @@ host     = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" }
 web_host = ENV.fetch('WEB_DOMAIN') { host }
 https    = ENV['LOCAL_HTTPS'] == 'true'
 
+alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { "" }
+
 Rails.application.configure do
   config.x.local_domain = host
   config.x.web_domain   = web_host
   config.x.use_https    = https
   config.x.use_s3       = ENV['S3_ENABLED'] == 'true'
 
+  config.x.alternate_domains = alternate_domains.split(/\s*,\s*/)
+
   config.action_mailer.default_url_options = { host: web_host, protocol: https ? 'https://' : 'http://', trailing_slash: false }
   config.x.streaming_api_base_url          = 'ws://localhost:4000'