Ver código fonte

Make "obtain certificates" tasks have unique names

We always skip at least one of these tasks, depending on which
SSL retrieval method is enabled, so it could have been confusing why.
pull/61/head
Slavi Pantaleev 7 anos atrás
pai
commit
f7aa362961
2 arquivos alterados com 2 adições e 2 exclusões
  1. +1
    -1
      roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml
  2. +1
    -1
      roles/matrix-server/tasks/setup/ssl/setup_ssl_self_signed.yml

+ 1
- 1
roles/matrix-server/tasks/setup/ssl/setup_ssl_lets_encrypt.yml Ver arquivo

@@ -25,7 +25,7 @@
name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}" name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}"
when: "matrix_ssl_retrieval_method == 'lets-encrypt'" when: "matrix_ssl_retrieval_method == 'lets-encrypt'"


- name: Obtain certificates
- name: Obtain Let's Encrypt certificates
include_tasks: "tasks/setup/ssl/setup_ssl_lets_encrypt_obtain_for_domain.yml" include_tasks: "tasks/setup/ssl/setup_ssl_lets_encrypt_obtain_for_domain.yml"
with_items: "{{ domains_requiring_certificates }}" with_items: "{{ domains_requiring_certificates }}"
loop_control: loop_control:


+ 1
- 1
roles/matrix-server/tasks/setup/ssl/setup_ssl_self_signed.yml Ver arquivo

@@ -16,7 +16,7 @@
update_cache: no update_cache: no
when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_os_family == 'Debian'" when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_os_family == 'Debian'"


- name: Obtain certificates
- name: Generate self-signed certificates
include_tasks: "tasks/setup/ssl/setup_ssl_self_signed_obtain_for_domain.yml" include_tasks: "tasks/setup/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
with_items: "{{ domains_requiring_certificates }}" with_items: "{{ domains_requiring_certificates }}"
loop_control: loop_control:


Carregando…
Cancelar
Salvar