Skip to content
Snippets Groups Projects

[15.10] Add SMTP timeout configuration options

Merged Stan Hu requested to merge sh-add-smtp-timeouts-15-10 into 15-10-stable
3 files
+ 53
1
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -506,6 +506,8 @@ default['gitlab']['gitlab-rails']['smtp_pool'] = false
# Path to the public Certificate Authority file
# defaults to /opt/gitlab/embedded/ssl/certs/cacert.pem. The install-dir path is set at build time
default['gitlab']['gitlab-rails']['smtp_ca_file'] = "#{node['package']['install-dir']}/embedded/ssl/certs/cacert.pem"
default['gitlab']['gitlab-rails']['smtp_open_timeout'] = 30
default['gitlab']['gitlab-rails']['smtp_read_timeout'] = 60
# Path to directory that contains (ca) certificates that should also be trusted (e.g. on
# outgoing Webhooks connections). For these certificates symlinks will be created in
Loading