tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved configuration from ENV, cleaned up timeline filter methods

Browse Source 
to be more readable, add extra logging to process feed service
This commit is contained in:
Eugen Rochko
2016-11-07 23:20:52 +01:00
parent 0400734df7
commit dbe00a4156
7 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/initializers/ostatus.rb
View File

@ -1,6 +1,8 @@
port = ENV.fetch('PORT') { 3000 }
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.local_domain = ENV.fetch('LOCAL_DOMAIN') { "localhost:#{port}" }
config.x.hub_url = ENV.fetch('HUB_URL') { 'https://pubsubhubbub.superfeedr.com' }
config.x.use_https = ENV['LOCAL_HTTPS'] == 'true'
config.x.use_s3 = ENV['S3_ENABLED'] == 'true'