From c5bdce682467167fae2d31f51fa51cddcc26ec08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Fra=C3=9F?= Date: Mon, 20 Nov 2023 16:44:28 +0100 Subject: [PATCH] [fix] role:tlscert_acme_* --- ansible/roles/tlscert_acme_inwx/defaults/main.json | 4 ++-- ansible/roles/tlscert_acme_inwx/tasks/main.json | 8 ++++---- ansible/roles/tlscert_acme_netcup/defaults/main.json | 2 +- ansible/roles/tlscert_acme_netcup/tasks/main.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ansible/roles/tlscert_acme_inwx/defaults/main.json b/ansible/roles/tlscert_acme_inwx/defaults/main.json index ec6886c..0151289 100644 --- a/ansible/roles/tlscert_acme_inwx/defaults/main.json +++ b/ansible/roles/tlscert_acme_inwx/defaults/main.json @@ -1,6 +1,6 @@ { - "var_tlscert_acme_inwx_letsencrypt_account_email": "REPLACE_ME", - "var_tlscert_acme_inwx_letsencrypt_account_key_path": "/etc/letsencrypt/key", + "var_tlscert_acme_inwx_acme_account_email": "REPLACE_ME", + "var_tlscert_acme_inwx_acme_account_key_path": "/etc/letsencrypt/key", "var_tlscert_acme_inwx_inwx_account_username": "REPLACE_ME", "var_tlscert_acme_inwx_inwx_account_password": "REPLACE_ME", "var_tlscert_acme_inwx_domain_base": "example.org", diff --git a/ansible/roles/tlscert_acme_inwx/tasks/main.json b/ansible/roles/tlscert_acme_inwx/tasks/main.json index 5d7c789..aa55079 100644 --- a/ansible/roles/tlscert_acme_inwx/tasks/main.json +++ b/ansible/roles/tlscert_acme_inwx/tasks/main.json @@ -45,7 +45,7 @@ "become": true, "ansible.builtin.file": { "state": "directory", - "path": "{{var_tlscert_acme_inwx_letsencrypt_account_key_path | dirname}}" + "path": "{{var_tlscert_acme_inwx_acme_account_key_path | dirname}}" } }, { @@ -68,7 +68,7 @@ "name": "acme | generate account key", "become": true, "ansible.builtin.shell": { - "cmd": "test -f {{var_tlscert_acme_inwx_letsencrypt_account_key_path}} || openssl genrsa 4096 > {{var_tlscert_acme_inwx_letsencrypt_account_key_path}}" + "cmd": "test -f {{var_tlscert_acme_inwx_acme_account_key_path}} || openssl genrsa 4096 > {{var_tlscert_acme_inwx_acme_account_key_path}}" } }, { @@ -78,7 +78,7 @@ "acme_version": 2, "acme_directory": "https://acme-v02.api.letsencrypt.org/directory", "account_email": "{{var_tlscert_acme_inwx_acme_account_email}}", - "account_key_src": "{{var_tlscert_acme_inwx_letsencrypt_account_key_path}}", + "account_key_src": "{{var_tlscert_acme_inwx_acme_account_key_path}}", "terms_agreed": true, "csr": "{{var_tlscert_acme_inwx_ssl_directory}}/csr/{{var_tlscert_acme_inwx_domain_path}}.{{var_tlscert_acme_inwx_domain_base}}.pem", "challenge": "dns-01", @@ -117,7 +117,7 @@ "acme_version": 2, "acme_directory": "https://acme-v02.api.letsencrypt.org/directory", "account_email": "{{var_tlscert_acme_inwx_acme_account_email}}", - "account_key_src": "{{var_tlscert_acme_inwx_letsencrypt_account_key_path}}", + "account_key_src": "{{var_tlscert_acme_inwx_acme_account_key_path}}", "terms_agreed": true, "csr": "{{var_tlscert_acme_inwx_ssl_directory}}/csr/{{var_tlscert_acme_inwx_domain_path}}.{{var_tlscert_acme_inwx_domain_base}}.pem", "challenge": "dns-01", diff --git a/ansible/roles/tlscert_acme_netcup/defaults/main.json b/ansible/roles/tlscert_acme_netcup/defaults/main.json index 4518788..bd60538 100644 --- a/ansible/roles/tlscert_acme_netcup/defaults/main.json +++ b/ansible/roles/tlscert_acme_netcup/defaults/main.json @@ -1,6 +1,6 @@ { "var_tlscert_acme_netcup_acme_account_email": "REPLACE_ME", - "var_tlscert_acme_netcup_letsencrypt_account_key_path": "/etc/letsencrypt/key", + "var_tlscert_acme_netcup_acme_account_key_path": "/etc/letsencrypt/key", "var_tlscert_acme_netcup_netcup_customer_id": "REPLACE_ME", "var_tlscert_acme_netcup_netcup_api_password": "REPLACE_ME", "var_tlscert_acme_netcup_netcup_api_key": "REPLACE_ME", diff --git a/ansible/roles/tlscert_acme_netcup/tasks/main.json b/ansible/roles/tlscert_acme_netcup/tasks/main.json index ba89d7d..bd2e968 100644 --- a/ansible/roles/tlscert_acme_netcup/tasks/main.json +++ b/ansible/roles/tlscert_acme_netcup/tasks/main.json @@ -45,7 +45,7 @@ "become": true, "ansible.builtin.file": { "state": "directory", - "path": "{{var_tlscert_acme_netcup_letsencrypt_account_key_path | dirname}}" + "path": "{{var_tlscert_acme_netcup_acme_account_key_path | dirname}}" } }, { @@ -68,7 +68,7 @@ "name": "acme | generate account key", "become": true, "ansible.builtin.shell": { - "cmd": "test -f {{var_tlscert_acme_netcup_letsencrypt_account_key_path}} || openssl genrsa 4096 > {{var_tlscert_acme_netcup_letsencrypt_account_key_path}}" + "cmd": "test -f {{var_tlscert_acme_netcup_acme_account_key_path}} || openssl genrsa 4096 > {{var_tlscert_acme_netcup_acme_account_key_path}}" } }, { @@ -78,7 +78,7 @@ "acme_version": 2, "acme_directory": "https://acme-v02.api.letsencrypt.org/directory", "account_email": "{{var_tlscert_acme_netcup_acme_account_email}}", - "account_key_src": "{{var_tlscert_acme_netcup_letsencrypt_account_key_path}}", + "account_key_src": "{{var_tlscert_acme_netcup_acme_account_key_path}}", "terms_agreed": true, "csr": "{{var_tlscert_acme_netcup_ssl_directory}}/csr/{{var_tlscert_acme_netcup_domain_path}}.{{var_tlscert_acme_netcup_domain_base}}.pem", "challenge": "dns-01", @@ -114,7 +114,7 @@ "acme_version": 2, "acme_directory": "https://acme-v02.api.letsencrypt.org/directory", "account_email": "{{var_tlscert_acme_netcup_acme_account_email}}", - "account_key_src": "{{var_tlscert_acme_netcup_letsencrypt_account_key_path}}", + "account_key_src": "{{var_tlscert_acme_netcup_acme_account_key_path}}", "terms_agreed": true, "csr": "{{var_tlscert_acme_netcup_ssl_directory}}/csr/{{var_tlscert_acme_netcup_domain_path}}.{{var_tlscert_acme_netcup_domain_base}}.pem", "challenge": "dns-01",