opendkim: properly create tmpdir; use DNSSEC

diff --git a/roles/email/tasks/opendkim.yml b/roles/email/tasks/opendkim.yml
index 1ac9e5a4509a2bd8e2df091b17b7d3b17ba16ae3..c56d6f566b5f4465e0ef4d60b702819eabca4a12 100644 (file)
--- a/roles/email/tasks/opendkim.yml
+++ b/roles/email/tasks/opendkim.yml
@@ -10,11 +10,14 @@
     src: templates/opendkim.env
 - name: regenerate opendkim service
   when: opendkim_env.changed
     src: templates/opendkim.env
 - name: regenerate opendkim service
   when: opendkim_env.changed

-  shell: /lib/opendkim/opendkim.service.generate && systemctl daemon-reload
+  shell: /lib/opendkim/opendkim.service.generate && systemctl daemon-reload && systemd-tmpfiles /etc/tmpfiles.d/opendkim.conf --create

   notify: opendkim
 # tables
   notify: opendkim
 # tables

+- name: create opendkim dir
+  file: name=/etc/opendkim state=directory owner=opendkim

 - name: generate opendkim keys
   shell: mkdir /etc/opendkim/{{ item }}/ && opendkim-genkey --bits=2048 -s mail -d {{ item }} -D /etc/opendkim/{{ item }}/
 - name: generate opendkim keys
   shell: mkdir /etc/opendkim/{{ item }}/ && opendkim-genkey --bits=2048 -s mail -d {{ item }} -D /etc/opendkim/{{ item }}/

+  become_user: opendkim

   args:
     creates: /etc/opendkim/{{ item }}/mail.private
     warn: False
   args:
     creates: /etc/opendkim/{{ item }}/mail.private
     warn: False

diff --git a/roles/email/templates/opendkim.conf b/roles/email/templates/opendkim.conf
index 6e4d8128e057f11aa65638be9e25470d6f4232bc..6fccfc29393a1fea1eaca2f1d93712d8c3ce5019 100644 (file)
--- a/roles/email/templates/opendkim.conf
+++ b/roles/email/templates/opendkim.conf
@@ -28,3 +28,11 @@ SenderHeaders                Sender,From
 # because it is often the identity key used by reputation systems and thus
 # somewhat security sensitive.
 OversignHeaders                From
 # because it is often the identity key used by reputation systems and thus
 # somewhat security sensitive.
 OversignHeaders                From

+
+##      default (none)
+##
+## Specifies a file from which trust anchor data should be read when doing
+## DNS queries and applying the DNSSEC protocol.  See the Unbound documentation
+## at http://unbound.net for the expected format of this file.
+
+TrustAnchorFile       /usr/share/dns/root.key