public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rmilter service: use runtime dirctory for socket

Browse Source
This commit is contained in:
Franz Pletz 2016-07-28 06:03:01 +02:00
parent 63784b8021
commit d23521b16c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/mail/rmilter.nix
View File

@ -75,7 +75,7 @@ in
bindUnixSockets = mkOption { bindUnixSockets = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = ["/run/rmilter.sock"]; default = ["/run/rmilter/rmilter.sock"];
description = '' description = ''
Unix domain sockets to listen for MTA requests. Unix domain sockets to listen for MTA requests.
''; '';
@ -114,7 +114,7 @@ in
servers = mkOption { servers = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = ["r:/run/rspamd.sock"]; default = ["r:/run/rspamd/rspamd.sock"];
description = '' description = ''
Spamd socket definitions. Spamd socket definitions.
Is server name is prefixed with r: it is rspamd server. Is server name is prefixed with r: it is rspamd server.
@ -197,7 +197,7 @@ milter_default_action = accept
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; 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; User = cfg.user;
Group = cfg.group; Group = cfg.group;
PermissionsStartOnly = true; PermissionsStartOnly = true;
@ -215,7 +215,7 @@ milter_default_action = accept
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
SocketUser = cfg.user; SocketUser = cfg.user;
SocketGroup = cfg.group; SocketGroup = cfg.group;
SocketMode = "0660"; SocketMode = "0666";
}; };
}; };