From d6ff0c078e6d70e50c888e016a8a8b9b0d8d7782 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Sun, 10 Jul 2016 05:05:46 +0200
Subject: Postfix MX/MSA instances: put certs in the the instance's
 $config_directory.

---
 roles/MX/tasks/main.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'roles/MX/tasks/main.yml')

diff --git a/roles/MX/tasks/main.yml b/roles/MX/tasks/main.yml
index 1d08734..5f19d9f 100644
--- a/roles/MX/tasks/main.yml
+++ b/roles/MX/tasks/main.yml
@@ -76,6 +76,14 @@
         owner=root group=root
         mode=0755
 
+- name: Create directory /etc/postfix/ssl
+  file: path=/etc/postfix-{{ postfix_instance[inst].name }}/ssl
+        state=directory
+        owner=root group=root
+        mode=0755
+  tags:
+    - genkey
+
 - meta: flush_handlers
 
 - name: Start Postfix
@@ -86,7 +94,7 @@
   become: False
   # `/usr/sbin/postmulti -i mx -x /usr/sbin/postconf -xh smtpd_tls_cert_file`
   fetch_cmd: cmd="openssl x509 -noout -pubkey"
-             stdin=/etc/postfix/ssl/mx.fripost.org.pem
+             stdin=/etc/postfix-{{ postfix_instance[inst].name }}/ssl/mx.fripost.org.pem
              dest=certs/public/mx{{ mxno | default('') }}.fripost.org.pub
   tags:
     - genkey
-- 
cgit v1.2.3