From d23521b16cf12bb94865c34673fc8317270da54c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 28 Jul 2016 06:03:01 +0200
Subject: rmilter service: use runtime dirctory for socket

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

diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix
index d1f7cd2e173e..e27b38bc0e2e 100644
--- a/nixos/modules/services/mail/rmilter.nix
+++ b/nixos/modules/services/mail/rmilter.nix
@@ -75,7 +75,7 @@ in
 
       bindUnixSockets =  mkOption {
         type = types.listOf types.str;
-        default = ["/run/rmilter.sock"];
+        default = ["/run/rmilter/rmilter.sock"];
         description = ''
           Unix domain sockets to listen for MTA requests.
         '';
@@ -114,7 +114,7 @@ in
 
         servers = mkOption {
           type = types.listOf types.str;
-          default = ["r:/run/rspamd.sock"];
+          default = ["r:/run/rspamd/rspamd.sock"];
           description = ''
             Spamd socket definitions.
             Is server name is prefixed with r: it is rspamd server.
@@ -197,7 +197,7 @@ milter_default_action = accept
 
       serviceConfig = {
         ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
-        ExecReload = "/bin/kill -USR1 $MAINPID";
+        ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
         User = cfg.user;
         Group = cfg.group;
         PermissionsStartOnly = true;
@@ -212,10 +212,10 @@ milter_default_action = accept
       description = "Rmilter service socket";
       wantedBy = [ "sockets.target" ];
       socketConfig = {
-          ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
-          SocketUser = cfg.user;
-          SocketGroup = cfg.group;
-          SocketMode = "0660";
+        ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
+        SocketUser = cfg.user;
+        SocketGroup = cfg.group;
+        SocketMode = "0666";
       };
     };
 
-- 
cgit 1.4.1