Download as
Browse Code »

Commit b8a35bdfa5a9629d4a9967bd5459f8afe9089d37

Authored by Jacob Vosmaer
2 parents 52f1c0e1 c6c8dafd
Exists in master and in 2 other branches 7-2-stable, 7-2-stable-ee

Merge branch 'master' into 'master' 

openssl_verify_mode for SMTP email configuration

Allows smtp parameter openssl_verify_mode. Fixes #211

See merge request !174
Showing 3 changed files with 3 additions and 1 deletions   Show diff stats
@@ -14,6 +14,7 @@ omnibus-gitlab repository. @@ -14,6 +14,7 @@ omnibus-gitlab repository.
14 - Recursively set the SELinux type of ~git/.ssh 14 - Recursively set the SELinux type of ~git/.ssh
15 - Add support for the LDAP admin_group attribute (GitLab EE) 15 - Add support for the LDAP admin_group attribute (GitLab EE)
16 - Fix TLS issue in SMTP email configuration (provides new attribute tls) (Ricardo Langner) 16 - Fix TLS issue in SMTP email configuration (provides new attribute tls) (Ricardo Langner)
  17 +- Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis)
17 - Support external Redis instances (sponsored by O'Reilly Media) 18 - Support external Redis instances (sponsored by O'Reilly Media)
18 - Only reject SMTP attributes which are nil 19 - Only reject SMTP attributes which are nil
19 - Support changing the 'restricted_visibility_levels' option (Javier Palomo) 20 - Support changing the 'restricted_visibility_levels' option (Javier Palomo)
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @b8a35bd
@@ -144,6 +144,7 @@ default['gitlab']['gitlab-rails']['smtp_domain'] = nil @@ -144,6 +144,7 @@ default['gitlab']['gitlab-rails']['smtp_domain'] = nil
144 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil 144 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
145 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil 145 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
146 default['gitlab']['gitlab-rails']['smtp_tls'] = nil 146 default['gitlab']['gitlab-rails']['smtp_tls'] = nil
  147 +default['gitlab']['gitlab-rails']['smtp_openssl_verify_mode'] = nil
147 148
148 #### 149 ####
149 # Unicorn 150 # Unicorn
files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb
  Diff comments   View file @b8a35bd
@@ -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 tls }.each do |key| %> 10 +<% %w{ address port user_name password domain enable_starttls_auto tls openssl_verify_mode }.each do |key| %>
11 <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %> 11 <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %>
12 <% unless value.nil? %> 12 <% unless value.nil? %>
13 <%= "#{key}: #{value.inspect}," %> 13 <%= "#{key}: #{value.inspect}," %>