diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-10-11 18:17:49 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-10-11 18:17:49 +0200 |
| commit | bf23ce191ba6daf3dfca604243dd88d2e3996eff (patch) | |
| tree | 94d458706ad5c8cd7ec006f174de90363aab485e /config | |
| parent | 03b7fe71a5c5372fc8239a26e757685ab12eed87 (diff) | |
| download | gitlab-ce-bf23ce191ba6daf3dfca604243dd88d2e3996eff.tar.gz | |
Enable arbitration in MailRoom
Diffstat (limited to 'config')
| -rw-r--r-- | config/mail_room.yml.example | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/config/mail_room.yml.example b/config/mail_room.yml.example index ed4a5193a6a..bb624e8a187 100644 --- a/config/mail_room.yml.example +++ b/config/mail_room.yml.example @@ -12,8 +12,10 @@ # :email: "gitlab-incoming@gmail.com" # # Email account password # :password: "password" + # # The name of the mailbox where incoming mail will end up. Usually "inbox". # :name: "inbox" + # # Always "sidekiq". # :delivery_method: sidekiq # # Always true. @@ -25,5 +27,13 @@ # :namespace: resque:gitlab # # Always "incoming_email". # :queue: incoming_email - # # Always "EmailReceiverWorker" + # # Always "EmailReceiverWorker". # :worker: EmailReceiverWorker + + # # Always "redis". + # :arbitration_method: redis + # :arbitration_options: + # # The URL to the Redis server. Should match the URL in config/resque.yml. + # :redis_url: redis://localhost:6379 + # # Always "mail_room:gitlab". + # :namespace: mail_room:gitlab |