nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5837 from jhass/fix_default_url_options

Browse source 
Move default_url_options to application.rb
This commit is contained in:
Jonne Haß 2015-04-01 18:34:27 +02:00
commit 4b54e1684f
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/application.rb
View file

@ -102,5 +102,12 @@ module Diaspora
# Will be default with Rails 5 # Will be default with Rails 5
config.active_record.raise_in_transactional_callbacks = true config.active_record.raise_in_transactional_callbacks = true
# Setup action mailer early
config.action_mailer.default_url_options = {
protocol: AppConfig.pod_uri.scheme,
host: AppConfig.pod_uri.authority
}
config.action_mailer.asset_host = AppConfig.pod_uri.to_s
end end
end end

9
config/initializers/mailer_config.rb
View file

@ -4,11 +4,6 @@
require Rails.root.join('lib', 'messagebus', 'mailer') require Rails.root.join('lib', 'messagebus', 'mailer')
Diaspora::Application.configure do Diaspora::Application.configure do
config.action_mailer.default_url_options = {
protocol: AppConfig.pod_uri.scheme,
host: AppConfig.pod_uri.authority
}
config.action_mailer.asset_host = AppConfig.pod_uri.to_s
config.action_mailer.perform_deliveries = AppConfig.mail.enable? config.action_mailer.perform_deliveries = AppConfig.mail.enable?
unless Rails.env == 'test' || !AppConfig.mail.enable? unless Rails.env == 'test' || !AppConfig.mail.enable?
@ -36,7 +31,7 @@ Diaspora::Application.configure do
enable_starttls_auto: false, enable_starttls_auto: false,
openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get openssl_verify_mode: AppConfig.mail.smtp.openssl_verify_mode.get
} }
if AppConfig.mail.smtp.authentication != "none" if AppConfig.mail.smtp.authentication != "none"
smtp_settings.merge!({ smtp_settings.merge!({
authentication: AppConfig.mail.smtp.authentication.gsub('-', '_').to_sym, authentication: AppConfig.mail.smtp.authentication.gsub('-', '_').to_sym,
@ -45,7 +40,7 @@ Diaspora::Application.configure do
enable_starttls_auto: AppConfig.mail.smtp.starttls_auto? enable_starttls_auto: AppConfig.mail.smtp.starttls_auto?
}) })
end end
config.action_mailer.smtp_settings = smtp_settings config.action_mailer.smtp_settings = smtp_settings
else else
$stderr.puts "WARNING: Mailer turned on with unknown method #{AppConfig.mail.method}. Mail won't work." $stderr.puts "WARNING: Mailer turned on with unknown method #{AppConfig.mail.method}. Mail won't work."