From 686b472e2355e0070a0c9c25875393feaa2bb44b Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Mon, 18 Sep 2023 19:10:35 +0300
Subject: [PATCH] remove selector and use custom selectors

---
 defaults/main.yml         |  1 +
 tasks/configure.yml       | 14 +++++++-------
 templates/keytable.j2     |  2 +-
 templates/signingtable.j2 |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c9e8e4d..0719912 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
 ---
 create_ovh_dns_entry: true
+dkim_selector: default
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 6333af8..7d420f8 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -55,13 +55,13 @@
 #     backup: true
 #   notify: Restart OpenDKIM service
 
-- name: Configure OpenDKIM selector
-  lineinfile:
-    path: /etc/opendkim.conf
-    regexp: '^Selector '
-    line: 'Selector                  ""'
-    backup: true
-  notify: Restart OpenDKIM service
+# - name: Configure OpenDKIM selector
+#   lineinfile:
+#     path: /etc/opendkim.conf
+#     regexp: '^Selector '
+#     line: 'Selector                  ""'
+#     backup: true
+#   notify: Restart OpenDKIM service
 
 - name: Ensure opendkim folder exists
   file:
diff --git a/templates/keytable.j2 b/templates/keytable.j2
index e9a9ba5..c3c7db8 100644
--- a/templates/keytable.j2
+++ b/templates/keytable.j2
@@ -1,3 +1,3 @@
 {% for domain in mail_domains %}
-  mail._domainkey.{{ domain }} {{ domain }}:mail:/etc/opendkim/{{ domain }}.private
+  {{ dkim_selector }}._domainkey.{{ domain }} {{ domain }}:selector:/etc/opendkim/{{ domain }}.private
 {% endfor %}
diff --git a/templates/signingtable.j2 b/templates/signingtable.j2
index dd7e09c..2b0a1b9 100644
--- a/templates/signingtable.j2
+++ b/templates/signingtable.j2
@@ -1,3 +1,3 @@
 {% for domain in mail_domains %}
-  *@{{ domain }} mail._domainkey.{{ domain }}
+  *@{{ domain }} {{ dkim_selector }}._domainkey.{{ domain }}
 {% endfor %}