From e612b8698652b47c13cf8c213a14ebec2b8ce2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sun, 11 Feb 2024 00:32:46 +0100 Subject: Fix local delivery considered spam in rspamd --- deploy/flake.lock | 4 ++-- flake.lock | 4 ++-- flakes/flake.lock | 2 +- systems/eldiron/mail/rspamd.nix | 7 +++++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/deploy/flake.lock b/deploy/flake.lock index 192c8af..18f9a3e 100644 --- a/deploy/flake.lock +++ b/deploy/flake.lock @@ -2783,7 +2783,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-DeWr1m0P91J1+9gJGexMYWzcALQbBgATj3McCL7cpE0=", + "narHash": "sha256-/gm162qfrbtwCxYYDhrL4MfezVXHd19mCBaxIpdg5gE=", "path": "../flakes", "type": "path" }, @@ -3903,7 +3903,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", + "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", "path": "../systems/eldiron", "type": "path" }, diff --git a/flake.lock b/flake.lock index 2010f30..2cc4fad 100644 --- a/flake.lock +++ b/flake.lock @@ -2664,7 +2664,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-DeWr1m0P91J1+9gJGexMYWzcALQbBgATj3McCL7cpE0=", + "narHash": "sha256-/gm162qfrbtwCxYYDhrL4MfezVXHd19mCBaxIpdg5gE=", "path": "./flakes", "type": "path" }, @@ -3919,7 +3919,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", + "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", "path": "../systems/eldiron", "type": "path" }, diff --git a/flakes/flake.lock b/flakes/flake.lock index 613f5ff..72e1a7f 100644 --- a/flakes/flake.lock +++ b/flakes/flake.lock @@ -3824,7 +3824,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", + "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", "path": "../systems/eldiron", "type": "path" }, diff --git a/systems/eldiron/mail/rspamd.nix b/systems/eldiron/mail/rspamd.nix index a300cc5..8a2b5f3 100644 --- a/systems/eldiron/mail/rspamd.nix +++ b/systems/eldiron/mail/rspamd.nix @@ -41,6 +41,13 @@ ''; }; locals = { + "composites.conf".text = '' + # Local delivered e-mails have both SMTP AUTH and only one Received + "LOCAL_DELIVERED_EMAILS" = { + expression = "RCVD_VIA_SMTP_AUTH and ONCE_RECEIVED"; + score = -10.0; + } + ''; "redis.conf".text = '' servers = "${config.myEnv.mail.rspamd.redis.socket}"; db = "${config.myEnv.mail.rspamd.redis.db}"; -- cgit v1.2.3