diff options
-rw-r--r-- | deploy/flake.lock | 4 | ||||
-rw-r--r-- | flake.lock | 4 | ||||
-rw-r--r-- | flakes/flake.lock | 2 | ||||
-rw-r--r-- | 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 @@ | |||
2783 | }, | 2783 | }, |
2784 | "locked": { | 2784 | "locked": { |
2785 | "lastModified": 1, | 2785 | "lastModified": 1, |
2786 | "narHash": "sha256-DeWr1m0P91J1+9gJGexMYWzcALQbBgATj3McCL7cpE0=", | 2786 | "narHash": "sha256-/gm162qfrbtwCxYYDhrL4MfezVXHd19mCBaxIpdg5gE=", |
2787 | "path": "../flakes", | 2787 | "path": "../flakes", |
2788 | "type": "path" | 2788 | "type": "path" |
2789 | }, | 2789 | }, |
@@ -3903,7 +3903,7 @@ | |||
3903 | }, | 3903 | }, |
3904 | "locked": { | 3904 | "locked": { |
3905 | "lastModified": 1, | 3905 | "lastModified": 1, |
3906 | "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", | 3906 | "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", |
3907 | "path": "../systems/eldiron", | 3907 | "path": "../systems/eldiron", |
3908 | "type": "path" | 3908 | "type": "path" |
3909 | }, | 3909 | }, |
@@ -2664,7 +2664,7 @@ | |||
2664 | }, | 2664 | }, |
2665 | "locked": { | 2665 | "locked": { |
2666 | "lastModified": 1, | 2666 | "lastModified": 1, |
2667 | "narHash": "sha256-DeWr1m0P91J1+9gJGexMYWzcALQbBgATj3McCL7cpE0=", | 2667 | "narHash": "sha256-/gm162qfrbtwCxYYDhrL4MfezVXHd19mCBaxIpdg5gE=", |
2668 | "path": "./flakes", | 2668 | "path": "./flakes", |
2669 | "type": "path" | 2669 | "type": "path" |
2670 | }, | 2670 | }, |
@@ -3919,7 +3919,7 @@ | |||
3919 | }, | 3919 | }, |
3920 | "locked": { | 3920 | "locked": { |
3921 | "lastModified": 1, | 3921 | "lastModified": 1, |
3922 | "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", | 3922 | "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", |
3923 | "path": "../systems/eldiron", | 3923 | "path": "../systems/eldiron", |
3924 | "type": "path" | 3924 | "type": "path" |
3925 | }, | 3925 | }, |
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 @@ | |||
3824 | }, | 3824 | }, |
3825 | "locked": { | 3825 | "locked": { |
3826 | "lastModified": 1, | 3826 | "lastModified": 1, |
3827 | "narHash": "sha256-kSgZHQTcr7TX4T80Ki/2ycsuD7SKCpS/SyahbXhulas=", | 3827 | "narHash": "sha256-VcujHASEo75hPaabtvxukzQwM1Stytl2ASDDn/TEPwc=", |
3828 | "path": "../systems/eldiron", | 3828 | "path": "../systems/eldiron", |
3829 | "type": "path" | 3829 | "type": "path" |
3830 | }, | 3830 | }, |
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 @@ | |||
41 | ''; | 41 | ''; |
42 | }; | 42 | }; |
43 | locals = { | 43 | locals = { |
44 | "composites.conf".text = '' | ||
45 | # Local delivered e-mails have both SMTP AUTH and only one Received | ||
46 | "LOCAL_DELIVERED_EMAILS" = { | ||
47 | expression = "RCVD_VIA_SMTP_AUTH and ONCE_RECEIVED"; | ||
48 | score = -10.0; | ||
49 | } | ||
50 | ''; | ||
44 | "redis.conf".text = '' | 51 | "redis.conf".text = '' |
45 | servers = "${config.myEnv.mail.rspamd.redis.socket}"; | 52 | servers = "${config.myEnv.mail.rspamd.redis.socket}"; |
46 | db = "${config.myEnv.mail.rspamd.redis.db}"; | 53 | db = "${config.myEnv.mail.rspamd.redis.db}"; |