From c8831139e05faa0819d6872c7e830abf270942df Mon Sep 17 00:00:00 2001
From: ace <ace@0xace.cc>
Date: Sun, 5 May 2024 23:04:47 +0300
Subject: [PATCH] fix dkim, tsig and vapid keys generation

---
 roles/pwgen/tasks/dkim.yaml  | 2 +-
 roles/pwgen/tasks/tsig.yaml  | 7 +++++--
 roles/pwgen/tasks/vapid.yaml | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/pwgen/tasks/dkim.yaml b/roles/pwgen/tasks/dkim.yaml
index 5adc685..2fff757 100644
--- a/roles/pwgen/tasks/dkim.yaml
+++ b/roles/pwgen/tasks/dkim.yaml
@@ -19,7 +19,7 @@
 
 - name: Set ddclient_key
   set_fact:
-    dkim_keys: "{{ dkim_container_output.ansible_facts.docker_container.Output | from_yaml }}"
+    dkim_keys: "{{ dkim_container_output.container.Output | from_yaml }}"
   when: dkim_private_key_test_grep.stdout == '0' or dkim_public_key_test_grep.stdout == '0'
 
 - name: Show DKIM private key
diff --git a/roles/pwgen/tasks/tsig.yaml b/roles/pwgen/tasks/tsig.yaml
index 1f9d460..e427347 100644
--- a/roles/pwgen/tasks/tsig.yaml
+++ b/roles/pwgen/tasks/tsig.yaml
@@ -25,9 +25,12 @@
   register: knot_container_output
   when: k8s_tsig_test_grep.stdout == '0'
 
+- debug:
+    msg: "{{ knot_container_output }}"
+
 - name: Set k8s_key
   set_fact:
-    k8s_key: "{{ knot_container_output.ansible_facts.docker_container.Output | from_yaml }}"
+    k8s_key: "{{ knot_container_output.container.Output | from_yaml }}"
   when: k8s_tsig_test_grep.stdout == '0'
 
 - name: Show k8s TSIG key
@@ -54,7 +57,7 @@
 
 - name: Set ddclient_key
   set_fact:
-    ddclient_key: "{{ ddclient_container_output.ansible_facts.docker_container.Output | from_yaml }}"
+    ddclient_key: "{{ ddclient_container_output.container.Output | from_yaml }}"
   when: ddclient_tsig_public_key_test_grep.stdout == '0' or ddclient_tsig_private_key_test_grep.stdout == '0'
 
 - name: Show ddclient TSIG public key file
diff --git a/roles/pwgen/tasks/vapid.yaml b/roles/pwgen/tasks/vapid.yaml
index 321d7b6..f4adb80 100644
--- a/roles/pwgen/tasks/vapid.yaml
+++ b/roles/pwgen/tasks/vapid.yaml
@@ -19,7 +19,7 @@
 
 - name: Set VAPID keys fact
   set_fact:
-    vapid_keys: "{{ vapid_container_output.ansible_facts.docker_container.Output | from_yaml }}"
+    vapid_keys: "{{ vapid_container_output.container.Output | from_yaml }}"
   when: vapid_private_key_test_grep.stdout == '0' or vapid_public_key_test_grep.stdout == '0'
 
 - name: Show VAPID private key