From 535741b9caaa7b1480d3a6e8290769b1e2e0a55e Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Fri, 4 Jul 2014 00:21:57 +0200
Subject: Don't restart/reload Postifx upon change of a file based database.

And don't restart or reload either upon change of pcre: files that are
used by smtpd(8), cleanup(8) or local(8), following the suggestion from
http://www.postfix.org/DATABASE_README.html#detect .
---
 roles/IMAP/tasks/mda.yml    | 8 +++-----
 roles/MSA/tasks/main.yml    | 1 +
 roles/MX/tasks/main.yml     | 1 +
 roles/common/tasks/mail.yml | 5 +----
 roles/out/tasks/main.yml    | 5 +----
 5 files changed, 7 insertions(+), 13 deletions(-)

(limited to 'roles')

diff --git a/roles/IMAP/tasks/mda.yml b/roles/IMAP/tasks/mda.yml
index 4a74ed3..a914f17 100644
--- a/roles/IMAP/tasks/mda.yml
+++ b/roles/IMAP/tasks/mda.yml
@@ -9,7 +9,7 @@
             dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf
             owner=root group=root
             mode=0644
-  register: r1
+  register: r
   notify:
     - Restart Postfix
 
@@ -30,6 +30,7 @@
     - transport_content_filter.cf
 
 - name: Copy recipient canonical
+  # no need to reload upon change, as cleanup(8) is short-running
   copy: src=etc/postfix/recipient_canonical.pcre
         dest=/etc/postfix-{{ postfix_instance[inst].name }}/recipient_canonical.pcre
         owner=root group=root
@@ -53,12 +54,9 @@
   postmap: cmd=postmap src=/etc/postfix-{{ postfix_instance[inst].name }}/relay_clientcerts db=cdb
            owner=root group=root
            mode=0644
-  register: r2
-  notify:
-    - Restart Postfix
 
 - name: Start Postfix
   service: name=postfix state=started
-  when: not (r1.changed or r2.changed)
+  when: not r.changed
 
 - meta: flush_handlers
diff --git a/roles/MSA/tasks/main.yml b/roles/MSA/tasks/main.yml
index a722311..30473a6 100644
--- a/roles/MSA/tasks/main.yml
+++ b/roles/MSA/tasks/main.yml
@@ -14,6 +14,7 @@
     - Restart Postfix
 
 - name: Copy the Regex to anonymize senders
+  # no need to reload upon change, as cleanup(8) is short-running
   copy: src=etc/postfix/anonymize_sender.pcre
         dest=/etc/postfix-{{ postfix_instance[inst].name }}/anonymize_sender.pcre
         owner=root group=root
diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml
index 2670703..accca14 100644
--- a/roles/MX/tasks/main.yml
+++ b/roles/MX/tasks/main.yml
@@ -47,6 +47,7 @@
             mode=0644
   with_items:
     - mailbox_domains.cf
+    # no need to reload upon change, as cleanup(8) is short-running
     - reserved_alias.pcre
     - alias.cf
     - mailbox.cf
diff --git a/roles/common/tasks/mail.yml b/roles/common/tasks/mail.yml
index 74919c8..3b2a41f 100644
--- a/roles/common/tasks/mail.yml
+++ b/roles/common/tasks/mail.yml
@@ -104,12 +104,9 @@
            owner=root group=root
            mode=0644
   when: "'out' not in group_names"
-  register: r5
-  notify:
-    - Restart Postfix
 
 - name: Start Postfix
   service: name=postfix state=started
-  when: not (r1.changed or r2.changed or r3.changed or r5.changed)
+  when: not (r1.changed or r2.changed or r3.changed)
 
 - meta: flush_handlers
diff --git a/roles/out/tasks/main.yml b/roles/out/tasks/main.yml
index 8bd8bbb..69d9ead 100644
--- a/roles/out/tasks/main.yml
+++ b/roles/out/tasks/main.yml
@@ -28,12 +28,9 @@
   postmap: cmd=postmap src=/etc/postfix-{{ postfix_instance[inst].name }}/relay_clientcerts db=cdb
            owner=root group=root
            mode=0644
-  register: r2
-  notify:
-    - Restart Postfix
 
 - name: Start Postfix
   service: name=postfix state=started
-  when: not (r1.changed or r2.changed)
+  when: not r.changed
 
 - meta: flush_handlers
-- 
cgit v1.2.3