From c25c1262b872581c73ee985a11cf3a1b877761d4 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Tue, 3 Jan 2023 12:55:40 +0100
Subject: [PATCH] comment regarding opendkim config, and fix ansible error

---
 roles/email/tasks/opendkim.yml      | 1 -
 roles/email/templates/opendkim.conf | 5 +++++
 roles/email/templates/opendkim.env  | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/roles/email/tasks/opendkim.yml b/roles/email/tasks/opendkim.yml
index 8da35b3..5b76b02 100644
--- a/roles/email/tasks/opendkim.yml
+++ b/roles/email/tasks/opendkim.yml
@@ -20,7 +20,6 @@
   become_user: opendkim
   args:
     creates: /etc/opendkim/{{ item }}/mail.private
-    warn: False
   loop: "{{ postfix.opendkim.private_keys }}"
 - name: generate opendkim tables
   template:
diff --git a/roles/email/templates/opendkim.conf b/roles/email/templates/opendkim.conf
index 6fccfc2..b603f87 100644
--- a/roles/email/templates/opendkim.conf
+++ b/roles/email/templates/opendkim.conf
@@ -36,3 +36,8 @@ OversignHeaders		From
 ## at http://unbound.net for the expected format of this file.
 
 TrustAnchorFile       /usr/share/dns/root.key
+
+
+# Path must match postfix main.cf
+Socket      local:/var/spool/postfix/opendkim/sock
+PidFile     /var/spool/postfix/opendkim/opendkim.pid
diff --git a/roles/email/templates/opendkim.env b/roles/email/templates/opendkim.env
index 02fadef..f56a2b9 100644
--- a/roles/email/templates/opendkim.env
+++ b/roles/email/templates/opendkim.env
@@ -1,5 +1,8 @@
 # Command-line options specified here will override the contents of
 # /etc/opendkim.conf. See opendkim(8) for a complete list of options.
+# RJ: This might seem redundant with the opendkim.conf settings,
+# but the script in /lib/opendkim/opendkim.service.generate also helps by
+# generating tmpfiles.d/opendkim.conf so replacing it seems like a hassle.
 #DAEMON_OPTS=""
 
 RUNDIR=/var/spool/postfix/opendkim
-- 
2.30.2