diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-11-17 15:10:25 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-11-17 15:10:25 +0300 |
| commit | 775cc997849359e703c200b1c6528cd56c591652 (patch) | |
| tree | 213bb0339b2f030dbacb279a3c9199c109e591c4 /doc/administration | |
| parent | bc15f6fb5b5bf4a92238f4a12a63968cb4dc8460 (diff) | |
| parent | c61a9b0f1a12972dd3c2ae4e968c11c72ced6756 (diff) | |
Merge branch 'mailroom_idle_timeout' into 'master'
Allows configuration of idle_timeout for incoming email.
https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/1087
See merge request !7423
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/reply_by_email.md | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/administration/reply_by_email.md b/doc/administration/reply_by_email.md index 5a9a1582877..14cd7a03826 100644 --- a/doc/administration/reply_by_email.md +++ b/doc/administration/reply_by_email.md @@ -105,6 +105,8 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow # The mailbox where incoming mail will end up. Usually "inbox". gitlab_rails['incoming_email_mailbox_name'] = "inbox" + # The IDLE command timeout. + gitlab_rails['incoming_email_idle_timeout'] = 60 ``` ```ruby @@ -133,6 +135,8 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow # The mailbox where incoming mail will end up. Usually "inbox". gitlab_rails['incoming_email_mailbox_name'] = "inbox" + # The IDLE command timeout. + gitlab_rails['incoming_email_idle_timeout'] = 60 ``` 1. Reconfigure GitLab and restart mailroom for the changes to take effect: @@ -192,6 +196,8 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow # The mailbox where incoming mail will end up. Usually "inbox". mailbox: "inbox" + # The IDLE command timeout. + idle_timeout: 60 ``` ```yaml @@ -221,6 +227,8 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow # The mailbox where incoming mail will end up. Usually "inbox". mailbox: "inbox" + # The IDLE command timeout. + idle_timeout: 60 ``` 1. Enable `mail_room` in the init script at `/etc/default/gitlab`: @@ -277,6 +285,8 @@ To set up a basic Postfix mail server with IMAP access on Ubuntu, follow # The mailbox where incoming mail will end up. Usually "inbox". mailbox: "inbox" + # The IDLE command timeout. + idle_timeout: 60 ``` As mentioned, the part after `+` is ignored, and this will end up in the mailbox for `gitlab-incoming@gmail.com`. |