From fb7611c1e059b87ba3bdd13229c3f2d96d41a794 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 7 Jun 2020 19:08:17 +0200 Subject: [PATCH] add X-Original-To header to e-mails + logs --- modules/private/mail/postfix.nix | 2 +- modules/private/system/eldiron.nix | 5 ++++- .../immae/history/_posts/2020-05-31-fix-postfix-headers.md | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index 0c95df5..c4b09b2 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix @@ -421,7 +421,7 @@ ${pkgs.dovecot}/libexec/dovecot/dovecot-lda -f "$sender" -a "$original_recipient" -d "$user" ''; in [ - "flags=DRhu" "user=vhost:vhost" + "flags=ODRhu" "user=vhost:vhost" "argv=${rspamc_dovecot}/bin/rspamc_dovecot \${sender} \${original_recipient} \${user}@\${nexthop}" ]; }; diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index 4b332d3..6ccaea5 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix @@ -83,7 +83,10 @@ '' # The star after /var/lib/* avoids deleting all folders in case of problem 0 3,9,15,21 * * * root rsync -e "ssh -i /var/secrets/rsync_backup/identity" --new-compress -aAXv --delete --numeric-ids --super --rsync-path="sudo rsync" /var/lib/* backup@dilion.immae.eu: > /dev/null - 0 0 * * * root journalctl -q --since="25 hours ago" -u postfix -g "immae.eu.*Recipient address rejected" + 0 0 * * * root journalctl -q --since="25 hours ago" -u postfix -t postfix/smtpd -g "immae.eu.*Recipient address rejected" + # Need a way to blacklist properly + # 0 0 * * * root journalctl -q --since="25 hours ago" -u postfix -t postfix/smtpd -g "NOQUEUE:" + 0 0 * * * root journalctl -q --since="25 hours ago" -u postfix -t postfix/smtp -g "status=bounced" '' ]; }; diff --git a/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md b/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md new file mode 100644 index 0000000..95f0bb4 --- /dev/null +++ b/modules/private/websites/immae/history/_posts/2020-05-31-fix-postfix-headers.md @@ -0,0 +1,7 @@ +--- +title: "Ajout d’un header dans les mails traités par postfix" +category: Fix +date: 2020-05-31 +--- +Un header X-Original-To a été ajouté aux en-têtes des e-mails reçus par +postfix pour indiquer la cible réelle du mail. -- 2.41.0