- Allows smtp parameter tls. This adds the solution for the gitlabhq issue #5636

Ricardo Langner
1 parent 581975d8
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
@@ -7,7 +7,7 @@ if Rails.env.production?
   ActionMailer::Base.smtp_settings = {
     authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
-<% %w{ address port user_name password domain enable_starttls_auto }.each do |key| %>
+<% %w{ address port user_name password domain enable_starttls_auto tls }.each do |key| %>
   <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
     <%= "#{key}: #{value.inspect}," %>
   <% end %>
	@@ -7,7 +7,7 @@ if Rails.env.production?		@@ -7,7 +7,7 @@ if Rails.env.production?
7		7
8	ActionMailer::Base.smtp_settings = {	8	ActionMailer::Base.smtp_settings = {
9	authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,	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	<% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>	11	<% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
12	<%= "#{key}: #{value.inspect}," %>	12	<%= "#{key}: #{value.inspect}," %>
13	<% end %>	13	<% end %>