journalwatch: allow more TLS errors

[ansible.git] / roles / email / tasks / opendkim.yml

diff --git a/roles/email/tasks/opendkim.yml b/roles/email/tasks/opendkim.yml
index 1ac9e5a4509a2bd8e2df091b17b7d3b17ba16ae3..5b76b02012e7aa5ff3ce22d11ce786bc6c88f821 100644 (file)
--- a/roles/email/tasks/opendkim.yml
+++ b/roles/email/tasks/opendkim.yml
@@ -10,14 +10,16 @@
     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 && chmod +r /etc/systemd/system/opendkim.service.d/ -R && 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
   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: