From 3e00632a41894c15f8c89b627a6fb4f0b5ca1956 Mon Sep 17 00:00:00 2001
From: emorino <emorino@evolix.fr>
Date: Mon, 29 May 2023 10:51:36 +0200
Subject: [PATCH] Add include to /etc/opendkim-evolix.conf on default
 configuration file, cf. #68552

---
 opendkim/files/opendkim-evolix.conf | 17 +++++++++++++++++
 opendkim/tasks/main.yml             | 14 ++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 opendkim/files/opendkim-evolix.conf

diff --git a/opendkim/files/opendkim-evolix.conf b/opendkim/files/opendkim-evolix.conf
new file mode 100644
index 00000000..ed80dc8b
--- /dev/null
+++ b/opendkim/files/opendkim-evolix.conf
@@ -0,0 +1,17 @@
+UserID                  opendkim:opendkim
+Socket                  inet:8891@127.0.0.1
+PidFile                 /var/run/opendkim/opendkim.pid
+OversignHeaders         From
+TrustAnchorFile         /usr/share/dns/root.key
+Selector                default
+Canonicalization        relaxed/relaxed
+InternalHosts           refile:/etc/opendkim/TrustedHosts
+KeyTable                refile:/etc/opendkim/KeyTable
+LogResults              Yes
+LogWhy                  Yes
+Mode                    sv
+SigningTable            refile:/etc/opendkim/SigningTable
+Syslog                  Yes
+SyslogSuccess           Yes
+TemporaryDirectory      /var/tmp
+UMask                   007
diff --git a/opendkim/tasks/main.yml b/opendkim/tasks/main.yml
index 1c7a416a..96a521b5 100644
--- a/opendkim/tasks/main.yml
+++ b/opendkim/tasks/main.yml
@@ -45,10 +45,20 @@
   tags:
   - opendkim
 
+- name: Add Include in opendkim.conf
+  ansible.builtin.lineinfile:
+    dest: /etc/opendkim.conf
+    line: 'Include /etc/opendkim-evolix.conf'
+    state: present
+    create: no
+    mode: "0644"
+  tags:
+  - opendkim
+
 - name: copy OpenDKIM config
   ansible.builtin.copy:
-    src: opendkim.conf
-    dest: /etc/opendkim.conf
+    src: opendkim-evolix.conf
+    dest: /etc/opendkim-evolix.conf
     mode: "0644"
     force: yes
   notify: restart opendkim