From 5c392f6204e069a2ec41a378ec2d9fb0ebec3d0a Mon Sep 17 00:00:00 2001
From: Aaron LI <aly@aaronly.me>
Date: Mon, 5 Mar 2018 14:21:32 +0800
Subject: mail/opendkim: Fix tables templating; update config; add handler

---
 roles/mail/handlers/main.yml          | 3 +++
 roles/mail/tasks/main.yml             | 7 ++++++-
 roles/mail/templates/opendkim.conf.j2 | 7 -------
 3 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 roles/mail/handlers/main.yml

diff --git a/roles/mail/handlers/main.yml b/roles/mail/handlers/main.yml
new file mode 100644
index 0000000..a164e26
--- /dev/null
+++ b/roles/mail/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: reload-opendkim
+  command: rcreload milter-opendkim
diff --git a/roles/mail/tasks/main.yml b/roles/mail/tasks/main.yml
index 186417f..59f1b0c 100644
--- a/roles/mail/tasks/main.yml
+++ b/roles/mail/tasks/main.yml
@@ -22,18 +22,23 @@
 - name: opendkim - generate tables
   template:
     src: "{{ item }}"
-    dest: /usr/local/etc/mail/dkim/{{ item | basename | regex_replace('\\.zone\\.j2', '') }}
+    dest: /usr/local/etc/mail/dkim/{{ item | basename | regex_replace('\.j2', '') }}
   with_items:
     - dkim/KeyTable.j2
     - dkim/SigningTable.j2
+  notify: reload-opendkim
   tags: opendkim
 
 - name: opendkim - generate config file
   template:
     src: opendkim.conf.j2
     dest: /usr/local/etc/mail/opendkim.conf
+  notify: reload-opendkim
   tags: opendkim
 
+- name: opendkim - enable and start
+  command: rcenable milter-opendkim
+
 - name: postfix - set as mailer/MTA
   file:
     path: /etc/mail/mailer.conf
diff --git a/roles/mail/templates/opendkim.conf.j2 b/roles/mail/templates/opendkim.conf.j2
index 80aae02..c8ae3dd 100644
--- a/roles/mail/templates/opendkim.conf.j2
+++ b/roles/mail/templates/opendkim.conf.j2
@@ -91,13 +91,6 @@ Socket			inet:{{ mail.dkim.port }}@localhost
 #
 #UMask			007
 
-# Userid userid
-#
-# Change to user "userid" before starting normal operation?  May include
-# a group ID as well, separated from the userid by a colon.
-#
-UserID			mailnull:mailnull
-
 # Canonicalization hdrcanon[/bodycanon]
 #
 # Select canonicalizations to use when signing.  If the "bodycanon" is
-- 
cgit v1.2.2