...

1 files changed, 20 insertions, 3 deletions

diff --git a/ymir.nix b/ymir.nix
index b573080a..17ad1abc 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -594,8 +594,8 @@ in rec {
 
       milter_default_action = "accept";
       milter_protocol = "2";
-      smtpd_milters = ["local:private/dkim"];
-      non_smtpd_milters = ["local:private/dkim"];
+      smtpd_milters = ["local:private/dkim" "local:private/rspamd"];
+      non_smtpd_milters = ["local:private/dkim" "local:private/rspamd"];
 
       alias_maps = ''texthash:${pkgs.writeText "aliases" ''
         postmaster gkleen
@@ -1099,6 +1099,23 @@ in rec {
 
   services.rspamd = {
     enable = true;
-    postfix.enable = true;
+    workers = {
+      controller = {};
+      rspamd_proxy = {
+        bindSockets = [
+          { mode = "0660";
+            socket = "/var/lib/postfix/queue/private/rspamd";
+            owner = config.services.rspamd.user;
+            group = config.services.postfix.group;
+          }
+        ];
+        extraConfig = ''
+          upstream "local" {
+            default = yes;
+            self_scan = yes;
+          }
+        '';
+      };
+    };
   };
 }