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

rmilter: socket activation in nixos

Browse Source
This commit is contained in:
Alexander V. Nikolaev 2016-02-12 18:11:40 +02:00
parent 40f82550d8
commit c84c174eb2
1 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,9 +7,14 @@ let
rspamdCfg = config.services.rspamd; rspamdCfg = config.services.rspamd;
cfg = config.services.rmilter; cfg = config.services.rmilter;
inetSockets = map (sock: let s = stringSplit ":" sock; in "inet:${last s}:${head s}") cfg.bindInetSockets;
unixSockets = map (sock: "unix:${sock}") cfg.bindUnixSockets;
allSockets = unixSockets ++ inetSockets;
rmilterConf = '' rmilterConf = ''
pidfile = /run/rmilter/rmilter.pid; pidfile = /run/rmilter/rmilter.pid;
bind_socket = ${cfg.bindSocket}; bind_socket = ${if cfg.socketActivation then "fd:3" else concatStringsSep ", " allSockets};
tempdir = /tmp; tempdir = /tmp;
'' + (with cfg.rspamd; if enable then '' '' + (with cfg.rspamd; if enable then ''
@ -68,13 +73,36 @@ in
''; '';
}; };
bindSocket = mkOption { bindUnixSockets = mkOption {
type = types.string; type = types.listOf types.str;
default = "unix:/run/rmilter/rmilter.sock"; default = ["/run/rmilter/rmilter.sock"];
description = "Socket to listed for MTA requests"; description = ''
Unix domain sockets to listen for MTA requests.
'';
example = '' example = ''
"unix:/run/rmilter/rmilter.sock" or [ "/run/rmilter/rmilter.sock"]
"inet:11990@127.0.0.1" '';
};
bindInetSockets = mkOption {
type = types.listOf types.str;
default = [];
description = ''
Inet addresses to listen (in format accepted by systemd.socket)
'';
example = ''
["127.0.0.1:11990"]
'';
};
socketActivation = mkOption {
type = types.bool;
default = true;
description = ''
Enable systemd socket activation for rmilter.
(disabling socket activation not recommended
when unix socket used, and follow to wrong
permissions on unix domain socket.)
''; '';
}; };
@ -86,7 +114,7 @@ in
servers = mkOption { servers = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = ["r:0.0.0.0:11333"]; 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.
@ -129,7 +157,7 @@ in
type = types.str; type = types.str;
description = "Addon to postfix configuration"; description = "Addon to postfix configuration";
default = '' default = ''
smtpd_milters = ${cfg.bindSocket} smtpd_milters = ${head allSockets}
# or for TCP socket # or for TCP socket
# # smtpd_milters = inet:localhost:9900 # # smtpd_milters = inet:localhost:9900
milter_protocol = 6 milter_protocol = 6
@ -169,17 +197,26 @@ 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";
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
PermissionsStartOnly = true; PermissionsStartOnly = true;
Restart = "always"; Restart = "always";
RuntimeDirectory = "rmilter";
RuntimeDirectoryPermissions="0755";
}; };
preStart = '' };
${pkgs.coreutils}/bin/mkdir -p /run/rmilter
${pkgs.coreutils}/bin/chown ${cfg.user}:${cfg.group} /run/rmilter
'';
systemd.sockets.rmilter = mkIf cfg.socketActivation {
description = "Rmilter service socket";
wantedBy = [ "sockets.target" ];
socketConfig = {
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
SocketUser = cfg.user;
SocketGroup = config.ids.gids.adm;
SocketMode = "0660";
};
}; };
services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment; services.postfix.extraConfig = optionalString cfg.postfix.enable cfg.postfix.configFragment;