Download as
Browse Code »

Commit 582e1cdd8da90ae7ba96d92176a1ef4b342c9e71

Authored by Jacob Vosmaer
2 parents 76833442 07daec34
Exists in master and in 9 other branches 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'smtp_settings_robustness' into 'master' 

Smtp settings robustness
Showing 3 changed files with 7 additions and 9 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @582e1cd
... ... @@ -134,7 +134,7 @@ default['gitlab']['gitlab-rails']['smtp_port'] = nil
134 134 default['gitlab']['gitlab-rails']['smtp_user_name'] = nil
135 135 default['gitlab']['gitlab-rails']['smtp_password'] = nil
136 136 default['gitlab']['gitlab-rails']['smtp_domain'] = nil
137   -default['gitlab']['gitlab-rails']['smtp_authentication'] = "login"
  137 +default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
138 138 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
139 139  
140 140 ####
... ...
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
  Diff comments   View file @582e1cd
... ... @@ -101,7 +101,6 @@ end
101 101  
102 102 template_symlink File.join(gitlab_rails_etc_dir, "smtp_settings.rb") do
103 103 link_from File.join(gitlab_rails_source_dir, "config/initializers/smtp_settings.rb")
104   - helpers SingleQuoteHelper
105 104 owner "root"
106 105 group "root"
107 106 mode "0644"
... ...
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
  Diff comments   View file @582e1cd
... ... @@ -6,12 +6,11 @@ if Rails.env.production?
6 6 Gitlab::Application.config.action_mailer.delivery_method = :smtp
7 7  
8 8 ActionMailer::Base.smtp_settings = {
9   - address: <%= single_quote(@smtp_address) %>,
10   - port: <%= @smtp_port %>,
11   - user_name: <%= single_quote(@smtp_user_name) %>,
12   - password: <%= single_quote(@smtp_password) %>,
13   - domain: <%= single_quote(@smtp_domain) %>,
14   - authentication: :<%= @smtp_authentication %>,
15   - enable_starttls_auto: <%= @smtp_enable_starttls_auto %>
  9 + authentication: <%= @smtp_authentication.to_s.to_sym.inspect %>,
  10 +<% %w{ address port user_name password domain enable_starttls_auto }.each do |key| %>
  11 + <% if value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
  12 + <%= "#{key}: #{value.inspect}," %>
  13 + <% end %>
  14 +<% end %>
16 15 }
17 16 end
... ...