From c3801a909841d387cbf9bd430d8a4a73469152fe Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Wed, 6 Aug 2014 11:59:00 +0200
Subject: [PATCH] Add tips for getting email working

---
 README.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+), 0 deletions(-)

diff --git a/README.md b/README.md
index 4112630..c78fa73 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,20 @@ Try [specifying](#configuring-the-external-url-for-gitlab) an `external_url` in
 `/etc/gitlab/gitlab.rb`. Also check your firewall settings; port 80 (HTTP) or
 443 (HTTPS) might be closed on your GitLab server.
 
+#### Emails are not being delivered
+
+To test email delivery you can create a new GitLab account for an email that is
+not used in your GitLab instance yet.
+
+If necessary, you can modify the 'From' field of the emails sent by GitLab with
+the following setting in `/etc/gitlab/gitlab.rb`:
+
+```
+gitlab_rails['gitlab_email_from'] = 'gitlab@example.com'
+```
+
+Run `sudo gitlab-ctl reconfigure` for the change to take effect.
+
 #### Reconfigure freezes at `ruby_block[supervise_redis_sleep] action run`
 
 This happens when Runit has not been installed succesfully during `gitlab-ctl
@@ -379,6 +393,9 @@ gitlab_rails['smtp_password'] = "smtp password"
 gitlab_rails['smtp_domain'] = "example.com"
 gitlab_rails['smtp_authentication'] = "login"
 gitlab_rails['smtp_enable_starttls_auto'] = true
+
+# For some SMTP servers you need to use a specific 'From' address
+gitlab_rails['gitlab_email_from'] = 'gitlab@example.com'
 ```
 
 ### Omniauth (Google, Twitter, GitHub login)
--
libgit2 0.21.2