comment regarding opendkim config, and fix ansible error

diff --git a/roles/email/tasks/opendkim.yml b/roles/email/tasks/opendkim.yml
index 8da35b37301a1526edd4b44984fe88e0a50f190e..5b76b02012e7aa5ff3ce22d11ce786bc6c88f821 100644 (file)
--- 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
   become_user: opendkim
   args:
     creates: /etc/opendkim/{{ item }}/mail.private

-    warn: False

   loop: "{{ postfix.opendkim.private_keys }}"
 - name: generate opendkim tables
   template:
   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 6fccfc29393a1fea1eaca2f1d93712d8c3ce5019..b603f8736357b7905ca5a6c329ef10988a884feb 100644 (file)
--- 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
 ## 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 02fadef320f7cadd90d1681df3011f0c55691f2b..f56a2b9aac9b03c352e05b7e837c1746a5ab57ef 100644 (file)
--- 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.
 # 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
 #DAEMON_OPTS=""
 
 RUNDIR=/var/spool/postfix/opendkim