From 1b744e0e6320dabaa62bc369addf7f0b89cdc107 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 10 Jul 2016 04:53:37 +0200
Subject: Postfix: don't share the master.cf between the instances.

---
 roles/MSA/tasks/main.yml                   | 7 +++++--
 roles/MSA/templates/etc/postfix/main.cf.j2 | 8 ++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'roles/MSA')

diff --git a/roles/MSA/tasks/main.yml b/roles/MSA/tasks/main.yml
index 3800fe6..1c34720 100644
--- a/roles/MSA/tasks/main.yml
+++ b/roles/MSA/tasks/main.yml
@@ -5,10 +5,13 @@
     - postfix-pcre
 
 - name: Configure Postfix
-  template: src=etc/postfix/main.cf.j2
-            dest=/etc/postfix-{{ postfix_instance[inst].name }}/main.cf
+  template: src=etc/postfix/{{ item }}.j2
+            dest=/etc/postfix-{{ postfix_instance[inst].name }}/{{ item }}
             owner=root group=root
             mode=0644
+  with_items:
+    - main.cf
+    - master.cf
   notify:
     - Reload Postfix
 
diff --git a/roles/MSA/templates/etc/postfix/main.cf.j2 b/roles/MSA/templates/etc/postfix/main.cf.j2
index d3b8e66..29f9480 100644
--- a/roles/MSA/templates/etc/postfix/main.cf.j2
+++ b/roles/MSA/templates/etc/postfix/main.cf.j2
@@ -1,5 +1,5 @@
 ########################################################################
-# MSA configuration
+# Mail Submission Agent (MSA) configuration
 #
 # {{ ansible_managed }}
 # Do NOT edit this file directly!
@@ -17,8 +17,7 @@ myhostname          = smtp{{ msano | default('') }}.$mydomain
 mydomain            = fripost.org
 append_dot_mydomain = no
 
-# Turn off all TCP/IP listener ports except that necessary for the MSA.
-master_service_disable = !submission.inet inet
+mynetworks_style = host
 
 queue_directory       = /var/spool/postfix-{{ postfix_instance[inst].name }}
 data_directory        = /var/lib/postfix-{{ postfix_instance[inst].name }}
@@ -26,9 +25,6 @@ multi_instance_group  = {{ postfix_instance[inst].group | default('') }}
 multi_instance_name   = postfix-{{ postfix_instance[inst].name }}
 multi_instance_enable = yes
 
-# This server is a Mail Submission Agent
-mynetworks_style = host
-
 # No local delivery
 mydestination        =
 local_transport      = error:5.1.1 Mailbox unavailable
-- 
cgit v1.2.3