From 12fb975a2a8d8a141f49da8c2532637868551cf1 Mon Sep 17 00:00:00 2001 From: Salt Date: Sun, 2 Aug 2020 19:32:07 -0500 Subject: [PATCH] Reorganize acme vars --- roles/https/tasks/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/roles/https/tasks/main.yml b/roles/https/tasks/main.yml index a8efa0c..cc94642 100644 --- a/roles/https/tasks/main.yml +++ b/roles/https/tasks/main.yml @@ -34,8 +34,8 @@ email_address: "rehashedsalt@cock.li" - name: Create challenge for CSR acme_certificate: - acme_directory: "{{ acme_directory }}" - acme_version: 2 + acme.directory: "{{ acme.directory }}" + acme.version: 2 terms_agreed: yes account_email: "rehashedsalt@cock.li" account_key: "/etc/pki/cert/private/account.key" @@ -61,19 +61,19 @@ state: reloaded - name: Create well-known directory file: - path: "{{ acme_webroot }}/.well-known/acme-challenge" + path: "{{ acme.webroot }}/.well-known/acme-challenge" mode: "0755" recurse: yes state: directory - name: Copy challenge files copy: - dest: "{{ acme_webroot }}/{{ com_challenge['challenge_data'][website_url]['http-01']['resource'] }}" + dest: "{{ acme.webroot }}/{{ com_challenge['challenge_data'][website_url]['http-01']['resource'] }}" content: "{{ com_challenge['challenge_data'][website_url]['http-01']['resource_value'] }}" when: com_challenge['challenge_data']|length > 0 - name: Create certificate acme_certificate: - acme_directory: "{{ acme_directory }}" - acme_version: 2 + acme.directory: "{{ acme.directory }}" + acme.version: 2 account_key: /etc/pki/cert/private/account.key csr: "/etc/pki/cert/csr/{{ website_url }}.csr" dest: "/etc/pki/cert/crt/{{ website_url }}.crt" @@ -94,7 +94,7 @@ block: - name: Remove webroot file: - path: "{{ acme_webroot }}/.well-known/acme-challenge" + path: "{{ acme.webroot }}/.well-known/acme-challenge" state: absent - name: Remove temporary config file: