Download as
Browse Code »

Commit 8e1644ffcd29b6676289f995ea4b19fba4d02d3a

Authored by Jacob Vosmaer
2 parents 581975d8 5da61c54
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Merge branch 'master' into 'master' 

Email Config: Fixes known SMTP TLS issue and allows new/missing attribute tls for the smtp settings

As indicated in gitlabhq issue #5636 (https://github.com/gitlabhq/gitlabhq/issues/5636), some servers get a Net::ReadTimeout problem due to a missing parameter in their actionmailer config.

This small fix allows setting the attribute tls by using `gitlab_rails['smtp_tls'] = true`.
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
CHANGELOG
  Diff comments   View file @8e1644f
... ... @@ -10,6 +10,7 @@ omnibus-gitlab repository.
10 10 - Trigger Unicorn/Sidekiq restart during version change
11 11 - Recursively set the SELinux type of ~git/.ssh
12 12 - Add support for the LDAP admin_group attribute (GitLab EE)
  13 +- Fix TLS issue in SMTP email configuration (provides new attribute tls)
13 14  
14 15 7.0.0-ee.omnibus.1
15 16 - Fix MySQL build for Ubuntu 14.04
... ...
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
  Diff comments   View file @8e1644f
... ... @@ -7,7 +7,7 @@ if Rails.env.production?
7 7  
8 8 ActionMailer::Base.smtp_settings = {
9 9 authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
10   -<% %w{ address port user_name password domain enable_starttls_auto }.each do |key| %>
  10 +<% %w{ address port user_name password domain enable_starttls_auto tls }.each do |key| %>
11 11 <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
12 12 <%= "#{key}: #{value.inspect}," %>
13 13 <% end %>
... ...