tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
rmilter service: use runtime dirctory for socket
Franz Pletz
9 years ago
d23521b1
63784b80
+7
-7
1 changed file
expand all
collapse all
unified
split
nixos
modules
services
mail
rmilter.nix
+7
-7
nixos/modules/services/mail/rmilter.nix
···
75
75
76
76
bindUnixSockets = mkOption {
77
77
type = types.listOf types.str;
78
78
-
default = ["/run/rmilter.sock"];
78
78
+
default = ["/run/rmilter/rmilter.sock"];
79
79
description = ''
80
80
Unix domain sockets to listen for MTA requests.
81
81
'';
···
114
114
115
115
servers = mkOption {
116
116
type = types.listOf types.str;
117
117
-
default = ["r:/run/rspamd.sock"];
117
117
+
default = ["r:/run/rspamd/rspamd.sock"];
118
118
description = ''
119
119
Spamd socket definitions.
120
120
Is server name is prefixed with r: it is rspamd server.
···
197
197
198
198
serviceConfig = {
199
199
ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}";
200
200
-
ExecReload = "/bin/kill -USR1 $MAINPID";
200
200
+
ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID";
201
201
User = cfg.user;
202
202
Group = cfg.group;
203
203
PermissionsStartOnly = true;
···
212
212
description = "Rmilter service socket";
213
213
wantedBy = [ "sockets.target" ];
214
214
socketConfig = {
215
215
-
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
216
216
-
SocketUser = cfg.user;
217
217
-
SocketGroup = cfg.group;
218
218
-
SocketMode = "0660";
215
215
+
ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets;
216
216
+
SocketUser = cfg.user;
217
217
+
SocketGroup = cfg.group;
218
218
+
SocketMode = "0666";
219
219
};
220
220
};
221
221