Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add configuration to disable private status federation over PuSH (#4582)

Browse source
This commit is contained in:
Eugen Rochko 2017-08-24 17:51:32 +02:00 • committed by GitHub
parent b01a19fe39
commit cf615abbf9
4 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
config/initializers/ostatus.rb
View file

@ -5,7 +5,7 @@ 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') { "" }
alternate_domains = ENV.fetch('ALTERNATE_DOMAINS') { '' }
Rails.application.configure do
config.x.local_domain = host
@ -17,6 +17,7 @@ Rails.application.configure do
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'
config.x.use_ostatus_privacy = true
if Rails.env.production?
config.x.streaming_api_base_url = ENV.fetch('STREAMING_API_BASE_URL') { "ws#{https ? 's' : ''}://#{web_host}" }