From 766ece5b1068b485c31569faca1e9630cbd4d00c Mon Sep 17 00:00:00 2001 From: Markus Hauschild Date: Wed, 13 Feb 2019 15:40:12 +0100 Subject: [PATCH] acme-dnskey-generate: fix naming inconsistencies --- roles/acme-dnskey-generate/defaults/main.yml | 6 +++--- roles/acme-dnskey-generate/tasks/main.yml | 2 +- roles/acme-dnskey-generate/templates/nsupdate.key.j2 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/acme-dnskey-generate/defaults/main.yml b/roles/acme-dnskey-generate/defaults/main.yml index 4d4a09b..d0d23da 100644 --- a/roles/acme-dnskey-generate/defaults/main.yml +++ b/roles/acme-dnskey-generate/defaults/main.yml @@ -1,5 +1,5 @@ --- -dnskey_file: "/etc/nsupdate.key" -dnskey_algorithm: "hmac-sha512" -dnskey_server: "neon.binary-kitchen.net" +acme_dnskey_file: "/etc/acme/nsupdate.key" +acme_dnskey_algorithm: "hmac-sha512" +acme_dnskey_server: "neon.binary-kitchen.net" diff --git a/roles/acme-dnskey-generate/tasks/main.yml b/roles/acme-dnskey-generate/tasks/main.yml index 6a3fd9d..cf0c7c5 100644 --- a/roles/acme-dnskey-generate/tasks/main.yml +++ b/roles/acme-dnskey-generate/tasks/main.yml @@ -28,7 +28,7 @@ - name: Get nsupdate.key again shell: "pdnsutil list-tsig-keys | grep '^acme-{{ inventory_hostname }}. {{ acme_dnskey_algorithm }}'" - register: "pdns_key" + register: "pdns_nsupdate_key" when: "pdns_genkey is defined" changed_when: "False" delegate_to: "{{ acme_dnskey_server }}" diff --git a/roles/acme-dnskey-generate/templates/nsupdate.key.j2 b/roles/acme-dnskey-generate/templates/nsupdate.key.j2 index b1aad71..88995ef 100644 --- a/roles/acme-dnskey-generate/templates/nsupdate.key.j2 +++ b/roles/acme-dnskey-generate/templates/nsupdate.key.j2 @@ -1,4 +1,4 @@ key acme-{{ inventory_hostname }}. { - algorithm {{ acme_nsupdate_keyalgo }}; + algorithm {{ acme_dnskey_algorithm }}; secret "{{ pdns_nsupdate_key.stdout.split(' ')[2] }}"; };