Browse Source

Fix opendkim systemd unit

Emmanuel Bouthenot 3 years ago
parent
commit
0e44f058d2

+ 2 - 1
roles/common/handlers/dkim.yml

@@ -1,5 +1,6 @@
 - name: 'Restart opendkim'
-  service:
+  systemd:
+    daemon_reload: 'yes'
     name: 'opendkim'
     state: 'restarted'
 

+ 12 - 0
roles/common/tasks/dkim.yml

@@ -77,4 +77,16 @@
   tags:
     - 'dkim'
 
+- name: 'Install opendkim systemd service override'
+  template:
+    src: 'opendkim/opendkim.service.j2'
+    dest: '/etc/systemd/system/opendkim.service'
+    owner: 'root'
+    group: 'root'
+    mode: '0644'
+  notify:
+    - 'Restart opendkim'
+  tags:
+    - 'dkim'
+
 # vim: ft=yaml.ansible

+ 20 - 0
roles/common/templates/opendkim/opendkim.service.j2

@@ -0,0 +1,20 @@
+{% if ansible_prolog -%}
+{% from 'templates/ansible/prolog.j2' import prolog with context %}
+{{ prolog() }}
+{% endif -%}
+[Unit]
+Description=OpenDKIM DomainKeys Identified Mail (DKIM) Milter
+Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html
+After=network.target nss-lookup.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/opendkim/opendkim.pid
+User=opendkim
+UMask=0007
+ExecStart=/usr/sbin/opendkim -P /var/run/opendkim/opendkim.pid -p inet:8891@127.0.0.1
+Restart=on-failure
+ExecReload=/bin/kill -USR1 $MAINPID
+
+[Install]
+WantedBy=multi-user.target