gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master' 

add ssl option

fix the problem not set "ssl: true" in /var/opt/gitlab/gitlab-rails/etc/smtp_settings.rb when set "gitlab_rails['smtp_ssl'] = true" in /etc/gitlab/gitlab.rb.

the issue in https://gitlab.com/gitlab-org/gitlab-ce/issues/3498

See merge request !730
This commit is contained in:
Marin Jankovski 2016-04-13 15:12:14 +00:00
parent 8240ab3abc 93adca1b48
commit 4a377fc265
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
View File

@ -10,7 +10,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 tls openssl_verify_mode ca_path ca_file }.each do |key| %>
<% %w{ address port user_name password domain enable_starttls_auto tls ssl openssl_verify_mode ca_path ca_file }.each do |key| %>
<% value = node['gitlab'][container]["smtp_#{key}"] %>
<%= "#{key}: #{value.inspect}," unless value.nil? %>
<% end %>