Improve DKIM support

getodk · Sep 20, 2023 · 89f47c1 · 89f47c1
1 parent 3715b55
commit 89f47c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,4 +9,9 @@
 /files/postgres14/upgrade/*
 !/files/postgres14/upgrade/check-available-space
 
-/files/local/customssl/*.pem
+/files/local/customssl/*.pem
+
+/files/mail/rsa.private
+/files/mail/rsa.public
+
+/files/dkim/*
diff --git 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
diff --git a/files/mail/rsa.private b/files/mail/rsa.private