59ed1d3cbb
mail_room was configured to deliver mail to the `incoming_email` queue while `EmailReceiveWorker` was reading the `email_receiver` queue. Adds a migration that repeats the work of a previous migration to ensure all mails that wound up in the old queue get processed. Closes #23689
36 lines
1.1 KiB
YAML
36 lines
1.1 KiB
YAML
# If you change this file in a Merge Request, please also create
|
|
# a Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
|
|
#
|
|
:mailboxes:
|
|
<%
|
|
require_relative "lib/gitlab/mail_room" unless defined?(Gitlab::MailRoom)
|
|
config = Gitlab::MailRoom.config
|
|
|
|
if Gitlab::MailRoom.enabled?
|
|
%>
|
|
-
|
|
:host: <%= config[:host].to_json %>
|
|
:port: <%= config[:port].to_json %>
|
|
:ssl: <%= config[:ssl].to_json %>
|
|
:start_tls: <%= config[:start_tls].to_json %>
|
|
:email: <%= config[:user].to_json %>
|
|
:password: <%= config[:password].to_json %>
|
|
:idle_timeout: 60
|
|
|
|
:name: <%= config[:mailbox].to_json %>
|
|
|
|
:delete_after_delivery: true
|
|
|
|
:delivery_method: sidekiq
|
|
:delivery_options:
|
|
:redis_url: <%= config[:redis_url].to_json %>
|
|
:namespace: <%= Gitlab::Redis::SIDEKIQ_NAMESPACE %>
|
|
:queue: email_receiver
|
|
:worker: EmailReceiverWorker
|
|
|
|
:arbitration_method: redis
|
|
:arbitration_options:
|
|
:redis_url: <%= config[:redis_url].to_json %>
|
|
:namespace: <%= Gitlab::Redis::MAILROOM_NAMESPACE %>
|
|
|
|
<% end %>
|