From 17265b42068b31bb72a9599a6a8494a4603bf93b Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Thu, 8 Feb 2024 16:28:15 +0200
Subject: [PATCH] fix selector and domain folder

---
 tasks/configure.yml     | 4 ++--
 tasks/configure_ovh.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/configure.yml b/tasks/configure.yml
index 0f3ca8d..c5234a4 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -29,9 +29,9 @@
   when: opendkim_genkey_cmd is not defined
 
 - name: Generate DKIM keys
-  shell: "{{opendkim_genkey_cmd }} -D /etc/dkimkeys --domain={{ item }} --selector={{ dkim_selector }}"
+  shell: "{{opendkim_genkey_cmd }} -D /etc/dkimkeys/{{ item }} --domain={{ item }} --selector={{ dkim_selector }}"
   args:
-    creates: "/etc/dkimkeys/{{ item }}.txt"
+    creates: "/etc/dkimkeys/{{ item }}/{{ dkim_selector }}.txt"
   loop: "{{ mail_domains }}"
   notify: Restart OpenDKIM service
 
diff --git a/tasks/configure_ovh.yml b/tasks/configure_ovh.yml
index 3160286..3555824 100644
--- a/tasks/configure_ovh.yml
+++ b/tasks/configure_ovh.yml
@@ -1,7 +1,7 @@
 ---
 - name: Get DKIM key
   slurp:
-    src: "/etc/dkimkeys/{{ item }}.txt"
+    src: "/etc/dkimkeys/{{ item }}/{{ dkim_selector }}.txt"
   register: key_file
   loop: "{{ mail_domains }}"