Move from rmilter to rspamd #25

2018-05-13 03:35:03 +02:00
parent 410c6c410b
commit 616d779e1f
6 changed files with 84 additions and 72 deletions
--- a/mail-server/postfix.nix
+++ b/mail-server/postfix.nix
@@ -94,13 +94,9 @@ let
  inetSocket = addr: port: "inet:[${toString port}@${addr}]";
  unixSocket = sock: "unix:${sock}";

-  rmilter = config.services.rmilter;
-  rmilterSocket = if rmilter.bindSocket.type == "unix" then unixSocket rmilter.bindSocket.path
-    else inetSocket rmilter.bindSocket.address rmilter.bindSocket.port;
-
  smtpdMilters =
   (lib.optional cfg.dkimSigning "unix:/run/opendkim/opendkim.sock")
-   ++ [ rmilterSocket ];
+   ++ [ "unix:/run/rspamd/rspamd-milter.sock" ];

  policyd-spf = pkgs.writeText "policyd-spf.conf" (''
    TestOnly = 1