Simplify proxy certificates with letsencrypt, only define them once

tasks/buildcerts.yml

@@ -6,7 +6,7 @@
     src='/etc/letsencrypt/live/{{ item.domain }}'
     dest='/etc/haproxy/certs/{{ item.domain }}.pem'
     regexp='(fullchain)|(privkey)\.pem'
-  with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
-  when: item.active|default(true)
+  with_items: '{{ proxy_certificates|default([]) }}'
+  when: item.letsencrypt|default(false) and item.active|default(true)
   notify:
     - "Restart HAProxy"

tasks/main.yml

@@ -17,10 +17,10 @@
 
   - name: "Install Certs"
     include: '../../letsencrypt/tasks/cert.yml'
-    with_items: '{{ proxy_certificates_letsencrypt|default([]) }}'
+    with_items: '{{ proxy_certificates|default([]) }}'
     loop_control:
       loop_var: domain
-    when: domain.active|default(true)
+    when: domain.letsencrypt|default(false) and domain.active|default(true)
 
   - name: "Renew Existing Cert"
     include: '../../letsencrypt/tasks/renew.yml'