diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-08-24 17:51:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-24 17:51:32 +0200 |
commit | cf615abbf9323f3b73681306090de48f9e13a6b9 (patch) | |
tree | 619d0fd305c3e75649e9e676d8e343d08e4515b6 /config | |
parent | b01a19fe392e0dd16d6b3da3f0b56369f7837cc9 (diff) |
Add configuration to disable private status federation over PuSH (#4582)
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/ostatus.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index 342996dcd..a885545f8 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -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}" } |