config: refactor email settings.

* Add `Danbooru.config.mail_delivery_method` option.
* Remove `Danbooru.config.aws_ses_enabled?` option.
* Replace `Danbooru.config.aws_ses_options` with `Danbooru.config.mail_settings`.
This commit is contained in:
evazion
2019-12-13 02:29:00 -06:00
parent 33e3754c2d
commit a4e587aa6a
3 changed files with 25 additions and 20 deletions

View File

@@ -32,9 +32,15 @@ module Danbooru
config.autoload_paths += %W(#{config.root}/app/presenters #{config.root}/app/logical #{config.root}/app/mailers)
config.plugins = [:all]
config.time_zone = 'Eastern Time (US & Canada)'
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = {:enable_starttls_auto => false}
config.action_mailer.perform_deliveries = true
if Danbooru.config.mail_delivery_method.to_sym == :smtp
config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = Danbooru.config.mail_settings
elsif Danbooru.config.mail_delivery_method.to_sym == :sendmail
config.action_mailer.delivery_method = :sendmail
config.action_mailer.sendmail_settings = Danbooru.config.mail_settings
end
config.log_tags = [->(req) {"PID:#{Process.pid}"}]
config.action_controller.action_on_unpermitted_parameters = :raise
config.force_ssl = true