Quellcode durchsuchen

Merge pull request #570 from cimm/duplicate_when_in_letsencrypt

Remove duplicate when statement in Let's Encrypt task
Mike Ashley vor 9 Jahren
Ursprung
Commit
c3d4d0c41b
1 geänderte Dateien mit 1 neuen und 2 gelöschten Zeilen
  1. 1
    2
      roles/common/tasks/letsencrypt.yml

+ 1
- 2
roles/common/tasks/letsencrypt.yml Datei anzeigen

93
   shell: cat /etc/letsencrypt/live/{{ domain }}/cert.pem
93
   shell: cat /etc/letsencrypt/live/{{ domain }}/cert.pem
94
     /etc/letsencrypt/live/{{ domain }}/chain.pem >
94
     /etc/letsencrypt/live/{{ domain }}/chain.pem >
95
     /etc/letsencrypt/live/{{ domain }}/fullchain.pem
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
 - name: Set permissions on combined SSL public cert
98
 - name: Set permissions on combined SSL public cert
100
   file: name=/etc/letsencrypt/live/{{ domain }}/fullchain.pem mode=0644
99
   file: name=/etc/letsencrypt/live/{{ domain }}/fullchain.pem mode=0644

Laden…
Abbrechen
Speichern