From 5c260399e136631e026c17b9c08315660f9eaefc Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Fri, 25 Mar 2016 16:12:16 +0200
Subject: rmilter: correct paths to sockets

---
 nixos/modules/services/mail/rmilter.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nixos/modules')

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index f748e7a172ea..d1f7cd2e173e 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -75,12 +75,12 @@ in
 
       bindUnixSockets =  mkOption {
         type = types.listOf types.str;
-        default = ["/run/rmilter/rmilter.sock"];
+        default = ["/run/rmilter.sock"];
         description = ''
           Unix domain sockets to listen for MTA requests.
         '';
         example = ''
-            [ "/run/rmilter/rmilter.sock"] 
+            [ "/run/rmilter.sock"]
         '';
       };
 
@@ -114,7 +114,7 @@ in
 
         servers = mkOption {
           type = types.listOf types.str;
-          default = ["r:/run/rspamd/rspamd.sock"];
+          default = ["r:/run/rspamd.sock"];
           description = ''
             Spamd socket definitions.
             Is server name is prefixed with r: it is rspamd server.
@@ -214,13 +214,13 @@ milter_default_action = accept
       socketConfig = {
           ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
           SocketUser = cfg.user;
-          SocketGroup = config.ids.gids.adm;
+          SocketGroup = cfg.group;
           SocketMode = "0660";
       };
     };
 
     services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
-
+    users.users.postfix.extraGroups = [ cfg.group ];
   };
 
 }
-- 
cgit 1.4.1