From 86edaf9a8a3ad8d5b2bba3d9a6ad94b675ca7d1a Mon Sep 17 00:00:00 2001 From: Lucas Bartholemy Date: Wed, 13 Sep 2023 10:42:52 +0200 Subject: [PATCH] fix: DKIM key generation broken when Rspamd & OpenDKIM are enabled (#3535) Co-authored-by: Georg Lauterbach <44545919+georglauterbach@users.noreply.github.com> --- target/bin/open-dkim | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/target/bin/open-dkim b/target/bin/open-dkim index 0036ff8d..11b98975 100755 --- a/target/bin/open-dkim +++ b/target/bin/open-dkim @@ -4,8 +4,12 @@ source /usr/local/bin/helpers/index.sh if [[ -f /etc/dms-settings ]] && [[ $(_get_dms_env_value 'ENABLE_RSPAMD') -eq 1 ]]; then - /usr/local/bin/rspamd-dkim "${@}" - exit + if [[ $(_get_dms_env_value 'ENABLE_OPENDKIM') -eq 1 ]]; then + log 'error' "You enabled Rspamd and OpenDKIM - OpenDKIM will be implicitly used for DKIM keys" + else + /usr/local/bin/rspamd-dkim "${@}" + exit + fi fi KEYSIZE=2048