From 89f47c12f44c3d5d135a59d8705bc99aa8547235 Mon Sep 17 00:00:00 2001
From: Yaw Anokwa <yanokwa@gmail.com>
Date: Sun, 17 Sep 2023 15:14:39 -0700
Subject: [PATCH] Improve DKIM support

---
 .gitignore                 | 7 ++++++-
 docker-compose.yml         | 6 +++---
 files/dkim/config.disabled | 5 -----
 files/mail/rsa.private     | 0
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 files/dkim/config.disabled
 create mode 100644 files/mail/rsa.private

diff --git a/.gitignore b/.gitignore
index 3d744a41..6a1c9041 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,9 @@
 /files/postgres14/upgrade/*
 !/files/postgres14/upgrade/check-available-space
 
-/files/local/customssl/*.pem
\ No newline at end of file
+/files/local/customssl/*.pem
+
+/files/mail/rsa.private
+/files/mail/rsa.public
+
+/files/dkim/*
diff --git a/docker-compose.yml b/docker-compose.yml
index b250f45f..7846b104 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -27,12 +27,12 @@ services:
       POSTGRES_PASSWORD: odk
       POSTGRES_DATABASE: odk
   mail:
-    image: "ixdotai/smtp:v0.2.0"
+    image: "ixdotai/smtp:v0.5.1"
     volumes:
-      - ./files/dkim/config:/etc/exim4/_docker_additional_macros:ro
-      - ./files/dkim/rsa.private:/etc/exim4/domain.key:ro
+      - ./files/mail/rsa.private:/etc/exim4/dkim.key.temp:ro
     environment:
       - MAILNAME=${DOMAIN}
+      - DKIM_KEY_PATH=/etc/exim4/dkim.key.temp
     restart: always
   service:
     build:
diff --git a/files/dkim/config.disabled b/files/dkim/config.disabled
deleted file mode 100644
index 73346dc8..00000000
--- a/files/dkim/config.disabled
+++ /dev/null
@@ -1,5 +0,0 @@
-DKIM_DOMAIN = ${lc:${domain:$h_from:}}
-DKIM_KEY_FILE = /etc/exim4/domain.key
-DKIM_PRIVATE_KEY = ${if exists{DKIM_KEY_FILE}{DKIM_KEY_FILE}{0}}
-DKIM_SELECTOR = dkim
-DKIM_CANON = simple
diff --git a/files/mail/rsa.private b/files/mail/rsa.private
new file mode 100644
index 00000000..e69de29b