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

rmilter: correct paths to sockets

Browse Source
This commit is contained in:
Alexander V. Nikolaev 2016-03-25 16:12:16 +02:00
parent 5d26e80645
commit 5c260399e1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,12 +75,12 @@ in
bindUnixSockets = mkOption { bindUnixSockets = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = ["/run/rmilter/rmilter.sock"]; default = ["/run/rmilter.sock"];
description = '' description = ''
Unix domain sockets to listen for MTA requests. Unix domain sockets to listen for MTA requests.
''; '';
example = '' example = ''
[ "/run/rmilter/rmilter.sock"] [ "/run/rmilter.sock"]
''; '';
}; };
@ -114,7 +114,7 @@ in
servers = mkOption { servers = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = ["r:/run/rspamd/rspamd.sock"]; default = ["r:/run/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.
@ -214,13 +214,13 @@ milter_default_action = accept
socketConfig = { socketConfig = {
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
SocketUser = cfg.user; SocketUser = cfg.user;
SocketGroup = config.ids.gids.adm; SocketGroup = cfg.group;
SocketMode = "0660"; SocketMode = "0660";
}; };
}; };
services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;
users.users.postfix.extraGroups = [ cfg.group ];
}; };
} }