Merge branch 'master' of adellam/ansible-roles into master

2019-11-04 18:54:12 +01:00 · 2019-11-04 18:54:12 +01:00 · 0f1e1602d9
parent e0d48e0cf1 3108ff7ee9
commit 0f1e1602d9
2 changed files with 4 additions and 2 deletions
--- a/library/roles/ubuntu-deb-general/defaults/main.yml
+++ b/library/roles/ubuntu-deb-general/defaults/main.yml
@ -101,6 +101,7 @@ pki_dir: /etc/pki
 pki_subdirs:
  - certs
  - keys
+pki_install_a_custom_ca: False
  
 # Install our /etc/resolv.conf
 install_resolvconf: True
--- a/library/roles/ubuntu-deb-general/tasks/install_external_ca_cert.yml
+++ b/library/roles/ubuntu-deb-general/tasks/install_external_ca_cert.yml
@ -6,6 +6,7 @@
  notify: Update the CA bundle list
  tags: ca

- name: Install a CA file that contains both the letsencrypt complete chain, the INFN CA certs and the TERENA personal certs CA
-  copy: src=infn-letsencrypt-ca.crt dest={{ pki_dir }}/infn-letsencrypt-ca.crt
+- name: Install a CA file with the certificates that we need. From a URL
+  get_url: url={{ pki_custom_ca_url }} dest={{ pki_dir }}/{{ pki_custom_ca_filename }}
+  when: pki_install_a_custom_ca | bool
  tags: ca