Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve DKIM support #485

Merged
merged 1 commit into from
Sep 21, 2023
Merged

Improve DKIM support #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this because it's considered there's no need for further configuration beyond the private key?

Copy link
Member Author

@yanokwa yanokwa Sep 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct. It's now in the upstream container: https://github.com/ix-ai/smtp/blob/master/entrypoint.sh#L61

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

config.disabled can be removed because those rules are now baked into the container.

- ./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:
Expand Down
5 changes: 0 additions & 5 deletions files/dkim/config.disabled
View file
Open in desktop

This file was deleted.

Empty file added files/mail/rsa.private
View file
Open in desktop
Empty file.