From ba4f3d8b1e70d06857860e8289cd97594ae7a39d Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 19 Dec 2020 14:23:49 +0100
Subject: postfix spam services

---
 ymir.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'ymir.nix')

diff --git a/ymir.nix b/ymir.nix
index 5b008721..aeb27b72 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -525,8 +525,8 @@ in rec {
       authorized_verp_clients = "$mynetworks";
 
       milter_default_action = "accept";
-      smtpd_milters = ["local:private/dkim" "local:private/rspamd"];
-      non_smtpd_milters = ["local:private/dkim" "local:private/rspamd"];
+      smtpd_milters = ["local:/run/opendkim/opendkim.sock" "local:/run/rspamd/rspamd-milter.sock"];
+      non_smtpd_milters = ["local:/run/opendkim/opendkim.sock" "local:/run/rspamd/rspamd-milter.sock"];
 
       alias_maps = ''texthash:${pkgs.writeText "aliases" ''
         postmaster gkleen
@@ -632,7 +632,7 @@ in rec {
   services.opendkim = {
     enable = true;
     user = "postfix"; group = "postfix";
-    socket = "local:/var/lib/postfix/queue/private/dkim";
+    socket = "local:/run/opendkim/opendkim.sock";
     domains = ''csl:${concatStringsSep "," myDomains}'';
     keyPath = "/var/lib/dkim/";
     selector = "ymir";
@@ -1034,7 +1034,7 @@ in rec {
         type = "rspamd_proxy";
         bindSockets = [
           { mode = "0660";
-            socket = "/var/lib/postfix/queue/private/rspamd";
+            socket = "/run/rspamd/rspamd-milter.sock";
             owner = config.services.rspamd.user;
             group = config.services.postfix.group;
           }
-- 
cgit v1.2.3