From 9883d85c2a96f946679a6f60cfefefb498ae18d5 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 14 Mar 2022 10:02:22 +0100
Subject: [PATCH] Small postfix modifications

---
 app/email/config/postfix/main.cf | 5 +++--
 app/email/deploy/email.hcl       | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/email/config/postfix/main.cf b/app/email/config/postfix/main.cf
index 4204cb4..1fb4d01 100644
--- a/app/email/config/postfix/main.cf
+++ b/app/email/config/postfix/main.cf
@@ -21,8 +21,9 @@ compatibility_level = 2
 #===
 # TLS parameters
 #===
-smtpd_tls_cert_file=/etc/ssl/certs/postfix.crt
-smtpd_tls_key_file=/etc/ssl/private/postfix.key
+smtpd_tls_cert_file=/etc/ssl/postfix.crt
+smtpd_tls_key_file=/etc/ssl/postfix.key
+smtpd_tls_dh1024_param_file=auto
 smtpd_use_tls=yes
 smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
diff --git a/app/email/deploy/email.hcl b/app/email/deploy/email.hcl
index 96f9015..c69f51c 100644
--- a/app/email/deploy/email.hcl
+++ b/app/email/deploy/email.hcl
@@ -259,8 +259,7 @@ job "email" {
         command = "postfix"
         args = [ "start-fg" ]
         volumes = [
-          "secrets/ssl/certs:/etc/ssl/certs",
-          "secrets/ssl/private:/etc/ssl/private",
+          "secrets/ssl:/etc/ssl",
           "secrets/postfix:/etc/postfix-conf",
           "/dev/log:/dev/log"
         ]
@@ -382,13 +381,13 @@ job "email" {
       # --- secrets ---
       template {
         data = "{{ key \"secrets/email/postfix/postfix.crt\" }}"
-        destination = "secrets/ssl/certs/postfix.crt"
+        destination = "secrets/ssl/postfix.crt"
         perms = "400"
       }
 
       template {
         data = "{{ key \"secrets/email/postfix/postfix.key\" }}"
-        destination = "secrets/ssl/private/postfix.key"
+        destination = "secrets/ssl/postfix.key"
         perms = "400"
       }
     }