diff options
| author | George Claghorn <george@basecamp.com> | 2019-04-14 12:15:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-14 12:15:54 -0400 |
| commit | f480cfabcd9000b5817b610e21466299025b12d2 (patch) | |
| tree | 7ff1d11bae5f2b781cd48d0465dc87d3decbae52 /actionmailbox/lib | |
| parent | 00b0c84a9b78ce720700b04cf5d1c5f091fe63ca (diff) | |
| download | rails-f480cfabcd9000b5817b610e21466299025b12d2.tar.gz rails-f480cfabcd9000b5817b610e21466299025b12d2.tar.bz2 rails-f480cfabcd9000b5817b610e21466299025b12d2.zip | |
Remove the Amazon SES ingress
It's unusable and not ready to ship in Rails 6.0. We'll rewrite it for 6.1.
Diffstat (limited to 'actionmailbox/lib')
| -rw-r--r-- | actionmailbox/lib/action_mailbox/engine.rb | 11 | ||||
| -rw-r--r-- | actionmailbox/lib/rails/generators/installer.rb | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/actionmailbox/lib/action_mailbox/engine.rb b/actionmailbox/lib/action_mailbox/engine.rb index 039f04ac2f..bab3964d93 100644 --- a/actionmailbox/lib/action_mailbox/engine.rb +++ b/actionmailbox/lib/action_mailbox/engine.rb @@ -26,16 +26,7 @@ module ActionMailbox ActionMailbox.incinerate = app.config.action_mailbox.incinerate.nil? ? true : app.config.action_mailbox.incinerate ActionMailbox.incinerate_after = app.config.action_mailbox.incinerate_after || 30.days ActionMailbox.queues = app.config.action_mailbox.queues || {} - end - end - - initializer "action_mailbox.ingress" do |app| - config.to_prepare do - if ActionMailbox.ingress = app.config.action_mailbox.ingress.presence - if ingress_controller_class = "ActionMailbox::Ingresses::#{ActionMailbox.ingress.to_s.classify}::InboundEmailsController".safe_constantize - ingress_controller_class.prepare - end - end + ActionMailbox.ingress = app.config.action_mailbox.ingress end end end diff --git a/actionmailbox/lib/rails/generators/installer.rb b/actionmailbox/lib/rails/generators/installer.rb index 25cf528ef5..2864ea4e62 100644 --- a/actionmailbox/lib/rails/generators/installer.rb +++ b/actionmailbox/lib/rails/generators/installer.rb @@ -5,6 +5,6 @@ copy_file "#{__dir__}/mailbox/templates/application_mailbox.rb", "app/mailboxes/ environment <<~end_of_config, env: "production" # Prepare the ingress controller used to receive mail - # config.action_mailbox.ingress = :amazon + # config.action_mailbox.ingress = :postfix end_of_config |