浏览代码

Merge pull request #570 from cimm/duplicate_when_in_letsencrypt

Remove duplicate when statement in Let's Encrypt task
Mike Ashley 9 年前
父节点
当前提交
c3d4d0c41b
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1
    2
      roles/common/tasks/letsencrypt.yml

+ 1
- 2
roles/common/tasks/letsencrypt.yml 查看文件

@@ -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

正在加载...
取消
保存