diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-25 12:03:31 -0700 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-25 12:03:31 -0700 |
| commit | 5747fa00162a6bc5762bf0a1641ef743a772bdb8 (patch) | |
| tree | b96d117f0f48f3d1aadae209307f6da47db18ffe | |
| parent | f00fdc71e9ea4e227b405dbfa671bf9c6f94736d (diff) | |
| download | gitlab-ce-5747fa00162a6bc5762bf0a1641ef743a772bdb8.tar.gz | |
Fix docs
| -rw-r--r-- | doc/reply_by_email/postfix.md | 22 | ||||
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 4 |
2 files changed, 19 insertions, 7 deletions
diff --git a/doc/reply_by_email/postfix.md b/doc/reply_by_email/postfix.md index bab107b958d..1d80037c1da 100644 --- a/doc/reply_by_email/postfix.md +++ b/doc/reply_by_email/postfix.md @@ -100,7 +100,7 @@ The instructions make the assumption that you will be using the email address `r 1. Check if the `replies` user received the email: ```sh - sh - replies + su - replies mail ``` @@ -137,7 +137,7 @@ Courier, which we will install later to add IMAP authentication, requiers mailbo 1. Restart Postfix: ```sh - sudo postfix restart + sudo /etc/init.d/postfix restart ``` 1. Test the new setup: @@ -146,7 +146,7 @@ Courier, which we will install later to add IMAP authentication, requiers mailbo 2. Check if the `replies` user received the email: ```sh - sh - replies + su - replies MAIL=/home/replies/Maildir mail ``` @@ -197,7 +197,7 @@ Courier, which we will install later to add IMAP authentication, requiers mailbo 1. Configure Postfix to receive mail on all interfaces, which includes the internet: ```sh - sudo postconf -e "init_interfaces = all" + sudo postconf -e "inet_interfaces = all" ``` 1. Configure Postfix to receive mail on both IPv4 and IPv6 protocols: @@ -206,6 +206,18 @@ Courier, which we will install later to add IMAP authentication, requiers mailbo sudo postconf -e "inet_protocols = all" ``` +1. Configure Postfix to use the `+` delimiter for sub-addressing: + + ```sh + sudo postconf -e "recipient_delimiter = +" + ``` + +1. Restart Postfix: + + ```sh + sudo /etc/init.d/postfix restart + ``` + ## Test the final setup 1. Test SMTP under the new setup: @@ -246,7 +258,7 @@ Courier, which we will install later to add IMAP authentication, requiers mailbo 1. Check if the `replies` user received the email: ```sh - sh - replies + su - replies MAIL=/home/replies/Maildir mail ``` diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 2b9688c1b40..13f1cf58fca 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -595,7 +595,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - sudo_gitlab("RAILS_ENV=production bin/background_jobs start") + sudo_gitlab("RAILS_ENV=production sudo -u git -H bin/background_jobs start") ) for_more_information( see_installation_guide_section("Install Init Script"), @@ -726,7 +726,7 @@ namespace :gitlab do else puts "no".red try_fixing_it( - sudo_gitlab("RAILS_ENV=production bin/mail_room start") + sudo_gitlab("RAILS_ENV=production sudo -u git -H bin/mail_room start") ) for_more_information( see_installation_guide_section("Install Init Script"), |