From 1dad72bf13f5e28781a2b2b6654f72624d205576 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 22 Feb 2016 18:10:30 +0100
Subject: Fixes and general progress

---
 config/application.rb              | 2 ++
 config/environments/development.rb | 2 --
 config/initializers/ostatus.rb     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/application.rb b/config/application.rb
index a2f778dc3..dddf4905b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -6,6 +6,8 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
+Dotenv::Railtie.load
+
 module Mastodon
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/config/environments/development.rb b/config/environments/development.rb
index c3377aac8..b55e2144b 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -38,6 +38,4 @@ Rails.application.configure do
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
-
-  config.action_mailer.default_url_options = { host: ENV['NGROK_HOST'] }
 end
diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb
index 64204870b..6f00ba7ed 100644
--- a/config/initializers/ostatus.rb
+++ b/config/initializers/ostatus.rb
@@ -1 +1,6 @@
 LOCAL_DOMAIN = ENV['LOCAL_DOMAIN'] || 'localhost'
+HUB_URL      = ENV['HUB_URL'] || 'https://pubsubhubbub.superfeedr.com'
+
+Rails.application.configure do
+  config.action_mailer.default_url_options = { host: LOCAL_DOMAIN }
+end
-- 
cgit