Commit 5d3a86422d7621b98718a3574d715f08cab91b31
Exists in
master
and in
2 other branches
Merge branch 'email_settings' into 'master'
Add tips for getting email working Fixes #212 See merge request !176
Showing
1 changed file
with
18 additions
and
0 deletions
Show diff stats
README.md
| @@ -45,6 +45,20 @@ Try [specifying](#configuring-the-external-url-for-gitlab) an `external_url` in | @@ -45,6 +45,20 @@ Try [specifying](#configuring-the-external-url-for-gitlab) an `external_url` in | ||
| 45 | `/etc/gitlab/gitlab.rb`. Also check your firewall settings; port 80 (HTTP) or | 45 | `/etc/gitlab/gitlab.rb`. Also check your firewall settings; port 80 (HTTP) or |
| 46 | 443 (HTTPS) might be closed on your GitLab server. | 46 | 443 (HTTPS) might be closed on your GitLab server. |
| 47 | 47 | ||
| 48 | +#### Emails are not being delivered | ||
| 49 | + | ||
| 50 | +To test email delivery you can create a new GitLab account for an email that is | ||
| 51 | +not used in your GitLab instance yet. | ||
| 52 | + | ||
| 53 | +If necessary, you can modify the 'From' field of the emails sent by GitLab with | ||
| 54 | +the following setting in `/etc/gitlab/gitlab.rb`: | ||
| 55 | + | ||
| 56 | +``` | ||
| 57 | +gitlab_rails['gitlab_email_from'] = 'gitlab@example.com' | ||
| 58 | +``` | ||
| 59 | + | ||
| 60 | +Run `sudo gitlab-ctl reconfigure` for the change to take effect. | ||
| 61 | + | ||
| 48 | #### Reconfigure freezes at `ruby_block[supervise_redis_sleep] action run` | 62 | #### Reconfigure freezes at `ruby_block[supervise_redis_sleep] action run` |
| 49 | 63 | ||
| 50 | This happens when Runit has not been installed succesfully during `gitlab-ctl | 64 | This happens when Runit has not been installed succesfully during `gitlab-ctl |
| @@ -379,6 +393,10 @@ gitlab_rails['smtp_password'] = "smtp password" | @@ -379,6 +393,10 @@ gitlab_rails['smtp_password'] = "smtp password" | ||
| 379 | gitlab_rails['smtp_domain'] = "example.com" | 393 | gitlab_rails['smtp_domain'] = "example.com" |
| 380 | gitlab_rails['smtp_authentication'] = "login" | 394 | gitlab_rails['smtp_authentication'] = "login" |
| 381 | gitlab_rails['smtp_enable_starttls_auto'] = true | 395 | gitlab_rails['smtp_enable_starttls_auto'] = true |
| 396 | + | ||
| 397 | +# If your SMTP server does not like the default 'From: gitlab@localhost' you | ||
| 398 | +# can change the 'From' with this setting. | ||
| 399 | +gitlab_rails['gitlab_email_from'] = 'gitlab@example.com' | ||
| 382 | ``` | 400 | ``` |
| 383 | 401 | ||
| 384 | ### Omniauth (Google, Twitter, GitHub login) | 402 | ### Omniauth (Google, Twitter, GitHub login) |