hook for haproxy working

tasks/create-cert-dns-plugin.yml

@@ -16,13 +16,13 @@
 
 - name: Create deploy hook to execute tasks post cert generatation.
   template:
-    src: renew_hook.j2
-    dest: /etc/letsencrypt/renewal-hooks/deploy/renew_hook.sh
+    src: deploy_hook.j2
+    dest: /etc/letsencrypt/renewal-hooks/deploy/deploy_hook.sh
     owner: root
     group: root
     mode: 0750
   when:
-    - certbot_create_dns_renew_hook_services is defined
+    - certbot_create_dns_deploy_hook_services is defined
 
 - name: "Create DNS RFC {{ certbot_dns_plugin }} Credentials File."
   template:
@@ -49,16 +49,3 @@
 - name: Generate new certificate if one doesn't exist.
   command: "{{ certbot_dns_create_command }}"
   when: not letsencrypt_cert.stat.exists
-
-- name: Assemble certificate crt and key into pem file for haproxy
-  assemble:
-    dest: "/etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/{{ cert_item.domains | first | replace('*.', '') }}-haproxy.pem"
-    src: "/etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/"
-    regexp: '(fullchain.pem|privkey.pem)'
-    remote_src: yes
-    owner: root
-    group: root
-    mode: '0600'
-  when: 
-    - not letsencrypt_cert.stat.exists 
-    - ('haproxy' is in certbot_create_dns_renew_hook_services)|bool

tasks/delete-cert.yml

@@ -0,0 +1,26 @@
+---
+- name: Check if certificate already exists.
+  stat:
+    path: /etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}/cert.pem
+  register: letsencrypt_cert
+
+- name: Delete Certificate
+  command: "{{ certbot_delete_command }}"
+  when: 
+    - letsencrypt_cert.stat.exists
+    - certbot_delete_certificate|bool
+
+- name: Make sure certificate directory is removed
+  file:
+    path: /etc/letsencrypt/live/{{ cert_item.domains | first | replace('*.', '') }}
+    state: absent
+  when: 
+    - letsencrypt_cert.stat.exists
+    - certbot_delete_certificate|bool
+
+- name: Remove cron job for certbot renewal (if configured).
+  cron:
+    name: Certbot automatic renewal.
+    state: absent
+  when:
+    - not certbot_auto_renew

tasks/install-with-package.yml

@@ -2,6 +2,10 @@
 - name: Install Certbot.
   package: "name={{ certbot_package }} state=present"
 
+- name: Install DNS Plugin - {{ certbot_dns_plugin }}.
+  package: name="certbot-dns-{{ certbot_dns_plugin }} state=present"
+  when: certbot_dns_plugin is defined
+
 - name: Set Certbot script variable.
   set_fact:
     certbot_script: "{{ certbot_package }}"

tasks/main.yml

@@ -13,11 +13,19 @@
 - import_tasks: install-from-source.yml
   when: certbot_install_method == 'source'
 
+- include_tasks: delete-cert.yml
+  with_items: "{{ certbot_certs }}"
+  when:
+    - certbot_delete_certificate|bool
+  loop_control:
+    loop_var: cert_item
+
 - include_tasks: create-cert-standalone.yml
   with_items: "{{ certbot_certs }}"
   when:
     - certbot_create_if_missing
     - certbot_create_method == 'standalone'
+    - not certbot_delete_certificate
   loop_control:
     loop_var: cert_item
 
@@ -26,8 +34,10 @@
   when:
     - certbot_create_if_missing
     - certbot_create_method == 'dns'
+    - not certbot_delete_certificate
   loop_control:
     loop_var: cert_item
 
 - import_tasks: renew-cron.yml
-  when: certbot_auto_renew
+  when: 
+    - certbot_auto_renew