From 0cc7abcdfef1e5b04c63f105ea84df85da72444f Mon Sep 17 00:00:00 2001 From: psy <psy@darmstadt.ccc.de> Date: Thu, 27 Oct 2022 19:48:43 +0200 Subject: [PATCH] set none as default --- defaults/main.yml | 4 ++-- templates/gitlab.rb.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5e45454..5432eca 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -42,5 +42,5 @@ gitlab: starttls: true tls: false verify_ssl: 'peer' # Can be: 'none', 'peer', 'client_once', 'fail_if_no_peer_cert' - #ca_path: '/etc/ssl/certs' - #ca_file: '/etc/ssl/certs/ca-certificates.crt' + ca_path: ~ # eg '/etc/ssl/certs' + ca_file: ~ # eg '/etc/ssl/certs/ca-certificates.crt' diff --git a/templates/gitlab.rb.j2 b/templates/gitlab.rb.j2 index 42350ef..a40dc8b 100644 --- a/templates/gitlab.rb.j2 +++ b/templates/gitlab.rb.j2 @@ -645,10 +645,10 @@ gitlab_rails['smtp_tls'] = {{ gitlab.smtp.tls|to_json }} ###! Docs: http://api.rubyonrails.org/classes/ActionMailer/Base.html 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 }}" {% endif %} -{% if 'ca_file' in gitlab.smtp %} +{% if gitlab.smtp.ca_file %} gitlab_rails['smtp_ca_file'] = "{{ gitlab.smtp.ca_file }}" {% endif %} {% endif %} -- GitLab