diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-25 15:50:41 +0200 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-26 05:02:47 +0200 |
| commit | f9126fbe0a73aa6d8d61be2eb249260fa29ac461 (patch) | |
| tree | 933146f3919db0197dc3e1b8103930fd0f585816 /config/mail_room.yml | |
| parent | ea8aa34b55f9029a823c6210258f8552fcaababe (diff) | |
| download | gitlab-ce-f9126fbe0a73aa6d8d61be2eb249260fa29ac461.tar.gz | |
Updated mail_room and added sentinel support to Reply by Email21645-mail_room_sentinel
Diffstat (limited to 'config/mail_room.yml')
| -rw-r--r-- | config/mail_room.yml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index 68697bd1dc4..b026d510f1b 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -27,10 +27,25 @@ :namespace: <%= Gitlab::Redis::SIDEKIQ_NAMESPACE %> :queue: email_receiver :worker: EmailReceiverWorker + <% if config[:sentinels] %> + :sentinels: + <% config[:sentinels].each do |sentinel| %> + - + :host: <%= sentinel[:host] %> + :port: <%= sentinel[:port] %> + <% end %> + <% end %> :arbitration_method: redis :arbitration_options: :redis_url: <%= config[:redis_url].to_json %> :namespace: <%= Gitlab::Redis::MAILROOM_NAMESPACE %> - + <% if config[:sentinels] %> + :sentinels: + <% config[:sentinels].each do |sentinel| %> + - + :host: <%= sentinel[:host] %> + :port: <%= sentinel[:port] %> + <% end %> + <% end %> <% end %> |