Explorar el Código

Merge pull request #570 from cimm/duplicate_when_in_letsencrypt

Remove duplicate when statement in Let's Encrypt task
Mike Ashley hace 9 años
padre
commit
c3d4d0c41b
Se han modificado 1 ficheros con 1 adiciones y 2 borrados
  1. 1
    2
      roles/common/tasks/letsencrypt.yml

+ 1
- 2
roles/common/tasks/letsencrypt.yml Ver fichero

@@ -93,8 +93,7 @@
93 93
   shell: cat /etc/letsencrypt/live/{{ domain }}/cert.pem
94 94
     /etc/letsencrypt/live/{{ domain }}/chain.pem >
95 95
     /etc/letsencrypt/live/{{ domain }}/fullchain.pem
96
-  when: private_key.changed or certificate.changed or ca_certificate.changed
97
-  when: ansible_ssh_user == "vagrant"
96
+  when: (private_key.changed or certificate.changed or ca_certificate.changed) and ansible_ssh_user == "vagrant"
98 97
 
99 98
 - name: Set permissions on combined SSL public cert
100 99
   file: name=/etc/letsencrypt/live/{{ domain }}/fullchain.pem mode=0644

Loading…
Cancelar
Guardar