Fix local delivery considered spam in rspamd

diff --git a/deploy/flake.lock b/deploy/flake.lock
index 192c8afdb4f74ed03684da0b468483c1b9e8a39e..18f9a3e3a3af79ccb21625c21eeb6989eb30781e 100644 (file)
--- 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 2010f30a8e3175b0c7afa7427a0d6d6042e34cce..2cc4fadbcefa8e6f95939c86f80caf333ee2ba61 100644 (file)
--- 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 613f5ff67f6c802770dcbbf00913269af45cf6a8..72e1a7f5ba24b8cafd9d4463459230b54d7b8c83 100644 (file)
--- 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 a300cc531d4049354cf2fecf0a355c0ffe59babb..8a2b5f3348614a1bc7bef60d0ae161363689910f 100644 (file)
--- 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}";