Download as
Browse Code »

Commit 4560a2dc97c91a552973e1f4d75037dd473dbcdc

Authored by Jacob Vosmaer
2 parents 5f8a9b03 901ad95a
Exists in master and in 4 other branches 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee

Merge branch 'smtp_tls_default_config' into 'master' 

Add TLS parameter to SMTP default configuration

With 0e78bd840449a26fb3c906a4dd9454fd3b94c5fc the TLS parameter was added to the erb-smtp template.
This MR adds a `nil` default value to the default attributes.

See merge request !170
Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
files/gitlab-cookbooks/gitlab/attributes/default.rb
  Diff comments   View file @4560a2d
@@ -141,6 +141,7 @@ default['gitlab']['gitlab-rails']['smtp_password'] = nil @@ -141,6 +141,7 @@ default['gitlab']['gitlab-rails']['smtp_password'] = nil
141 default['gitlab']['gitlab-rails']['smtp_domain'] = nil 141 default['gitlab']['gitlab-rails']['smtp_domain'] = nil
142 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil 142 default['gitlab']['gitlab-rails']['smtp_authentication'] = nil
143 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil 143 default['gitlab']['gitlab-rails']['smtp_enable_starttls_auto'] = nil
  144 +default['gitlab']['gitlab-rails']['smtp_tls] = nil
144 145
145 #### 146 ####
146 # Unicorn 147 # Unicorn