Skip to content
Snippets Groups Projects
Verified Commit 0cc7abcd authored by psy's avatar psy
Browse files

set none as default

parent afec86e2
No related branches found
No related tags found
1 merge request!1feature: smtp server settings
...@@ -42,5 +42,5 @@ gitlab: ...@@ -42,5 +42,5 @@ gitlab:
starttls: true starttls: true
tls: false tls: false
verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert' verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert'
#ca_path: '/etc/ssl/certs' ca_path: ~ # eg '/etc/ssl/certs'
#ca_file: '/etc/ssl/certs/ca-certificates.crt' ca_file: ~ # eg '/etc/ssl/certs/ca-certificates.crt'
...@@ -645,10 +645,10 @@ gitlab_rails['smtp_tls'] = {{ gitlab.smtp.tls|to_json }} ...@@ -645,10 +645,10 @@ gitlab_rails['smtp_tls'] = {{ gitlab.smtp.tls|to_json }}
###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html
gitlab_rails['smtp_openssl_verify_mode'] = '{{ gitlab.smtp.verify_ssl }}' gitlab_rails['smtp_openssl_verify_mode'] = '{{ gitlab.smtp.verify_ssl }}'
{% if 'ca_path' in gitlab.smtp %} {% if gitlab.smtp.ca_path %}
gitlab_rails['smtp_ca_path'] = "{{ gitlab.smtp.ca_path }}" gitlab_rails['smtp_ca_path'] = "{{ gitlab.smtp.ca_path }}"
{% endif %} {% endif %}
{% if 'ca_file' in gitlab.smtp %} {% if gitlab.smtp.ca_file %}
gitlab_rails['smtp_ca_file'] = "{{ gitlab.smtp.ca_file }}" gitlab_rails['smtp_ca_file'] = "{{ gitlab.smtp.ca_file }}"
{% endif %} {% endif %}
{% endif %} {% endif %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment