From e41ae43cfef6995e1b031d5d3fe167d4ac62dc94 Mon Sep 17 00:00:00 2001
From: AnsibleGuy <guy@ansibleguy.net>
Date: Sun, 7 Nov 2021 21:18:22 +0100
Subject: [PATCH] fixed after testing

---
 tasks/debian/letsencrypt/cert.yml | 9 ++++++---
 tasks/debian/letsencrypt/main.yml | 2 +-
 tasks/main.yml                    | 4 ----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tasks/debian/letsencrypt/cert.yml b/tasks/debian/letsencrypt/cert.yml
index f8fe22d..54e295f 100644
--- a/tasks/debian/letsencrypt/cert.yml
+++ b/tasks/debian/letsencrypt/cert.yml
@@ -4,11 +4,14 @@
 
 - name: "Certificates | Debian | LetsEncrypt Certbot | {{ le_name }} | Creating directory"
   ansible.builtin.file:
-    path: "{{ le_path }}"
+    path: "{{ item }}"
     state: directory
     owner: 'root'
     group: 'root'
     mode: 0755
+  loop:
+    - "{{ CERT_CONFIG.path }}"
+    - "{{ le_path }}"
 
 - name: "Certificates | Debian | LetsEncrypt Certbot | {{ le_name }} | Command to be executed"
   ansible.builtin.debug:
@@ -18,7 +21,7 @@
     --rsa-key-size {{ le_cert.key_size | default(CERT_CONFIG.cert.key_size, true) }}
     --config-dir {{ CERT_CONFIG.letsencrypt.path }}
     {% for domain in le_cert.domains %}{% if domain | valid_domain %}--domain {{ domain }} {% endif %}{% endfor %}
-    {% if le_cert.email is not none %}--email {{ le_cert.email }} {% elif CERT_CONFIG.cert.email | default(none, true) is not none %}--email {{ CERT_CONFIG.cert.email }} {% endif %}"
+    {% if le_cert.email is not none %}--email {{ le_cert.email }} {% else %}--email {{ CERT_CONFIG.cert.email }} {% endif %}"
   when: existing_certs_raw.stdout.find(name) == -1
 
 - name: "Certificates | Debian | LetsEncrypt Certbot | {{ le_name }} | Starting certbot"
@@ -28,7 +31,7 @@
     --rsa-key-size {{ le_cert.key_size | default(CERT_CONFIG.cert.key_size, true) }}
     --config-dir {{ CERT_CONFIG.letsencrypt.path }}
     {% for domain in le_cert.domains %}{% if domain | valid_domain %}--domain {{ domain }} {% endif %}{% endfor %}
-    {% if le_cert.email is not none %}--email {{ le_cert.email }} {% elif CERT_CONFIG.cert.email | default(none, true) is not none %}--email {{ CERT_CONFIG.cert.email }} {% endif %}"
+    {% if le_cert.email is not none %}--email {{ le_cert.email }} {% else %}--email {{ CERT_CONFIG.cert.email }} {% endif %}"
   when: existing_certs_raw.stdout.find(name) == -1
 
 - name: "Certificates | Debian | LetsEncrypt Certbot | {{ le_name }} | Linking cert"
diff --git a/tasks/debian/letsencrypt/main.yml b/tasks/debian/letsencrypt/main.yml
index 04eaaba..2519af1 100644
--- a/tasks/debian/letsencrypt/main.yml
+++ b/tasks/debian/letsencrypt/main.yml
@@ -36,7 +36,7 @@
   vars:
     le_cert: "{{ default_le_certbot_cert_config | combine(cert_item.value, recursive=true) }}"
     le_name: "{{ cert_item.key | safe_key }}"
-    le_path: "{{ CERT_CONFIG.letsencrypt.path }}/live/{{ name }}"
+    le_path: "{{ CERT_CONFIG.letsencrypt.path }}/live/{{ le_name }}"
   loop_control:
     loop_var: cert_item
   no_log: true
diff --git a/tasks/main.yml b/tasks/main.yml
index ad69746..b658e21 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,10 +6,6 @@
     Needed: 'certs'"
   when: certs is undefined
 
-- name: Certificates | Setting name
-  ansible.builtin.set_fact:
-    name: "{% if CERT_CONFIG.cert.name is not none %}{{ CERT_CONFIG.cert.name | safe_key }}{% else %}{{ CERT_CONFIG.cert.cn | safe_key }}{% endif %}"
-
 - name: Certificates | Internal signed
   ansible.builtin.include_tasks: internal/main.yml
   when: "CERT_CONFIG.mode in ['ca_full', 'ca', 'selfsigned']"