Merge branch 'smpt-tls-settings-together' into 'master'

Put all SMTP settings together in the template

See merge request gitlab-org/omnibus-gitlab!4695

files/gitlab-config-template/gitlab.rb.template

@@ -87,6 +87,13 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['smtp_enable_starttls_auto'] = true
 # gitlab_rails['smtp_tls'] = false
+###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
+###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html
+# gitlab_rails['smtp_openssl_verify_mode'] = 'none'
+
+# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
+# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
+
 ### Email Settings
 # gitlab_rails['gitlab_email_enabled'] = true
@@ -693,13 +700,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitlab_rails['redis_actioncable_instance'] = nil
 # gitlab_rails['redis_actioncable_sentinels'] = nil
-###! **Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'**
-###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html
-# gitlab_rails['smtp_openssl_verify_mode'] = 'none'
-
-# gitlab_rails['smtp_ca_path'] = "/etc/ssl/certs"
-# gitlab_rails['smtp_ca_file'] = "/etc/ssl/certs/ca-certificates.crt"
-
 ################################################################################
 ## Container Registry settings
 ##! Docs: https://docs.gitlab.com/ee/administration/container_registry.html