From 98df9099388f542173824dac6fb7512805142f25 Mon Sep 17 00:00:00 2001 From: Dennis Markgraf Date: Thu, 31 Jul 2014 14:01:47 +0200 Subject: [PATCH] Allows smtp parameter openssl_verify_mode. Fixes #211 --- CHANGELOG | 1 + files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f46e1c1..79536cb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ omnibus-gitlab repository. - Recursively set the SELinux type of ~git/.ssh - Add support for the LDAP admin_group attribute (GitLab EE) - Fix TLS issue in SMTP email configuration (provides new attribute tls) (Ricardo Langner) +- Add openssl_verify_mode to SMTP email configuration (Dionysius Marquis) - Support external Redis instances (sponsored by O'Reilly Media) - Only reject SMTP attributes which are nil - Support changing the 'restricted_visibility_levels' option (Javier Palomo) diff --git a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb b/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb index d972f3c..e39c4c2 100644 --- a/files/gitlab-cookbooks/gitlab/templates/default/smtp_settings.rb.erb +++ b/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 tls }.each do |key| %> +<% %w{ address port user_name password domain enable_starttls_auto tls openssl_verify_mode }.each do |key| %> <% value = node['gitlab']['gitlab-rails']["smtp_#{key}"] %> <% unless value.nil? %> <%= "#{key}: #{value.inspect}," %> -- libgit2 0.21.2