etherpad: configure DB charset like docs recommend

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

diff --git a/roles/email/tasks/opendkim.yml b/roles/email/tasks/opendkim.yml
index 1ac9e5a4509a2bd8e2df091b17b7d3b17ba16ae3..8da35b37301a1526edd4b44984fe88e0a50f190e 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 && 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
     warn: False
   args:
     creates: /etc/opendkim/{{ item }}/mail.private
     warn: False