rmilter service: use runtime dirctory for socket

+7 -7
+7 -7
nixos/modules/services/mail/rmilter.nix
··· 75 76 bindUnixSockets = mkOption { 77 type = types.listOf types.str; 78 - default = ["/run/rmilter.sock"]; 79 description = '' 80 Unix domain sockets to listen for MTA requests. 81 ''; ··· 114 115 servers = mkOption { 116 type = types.listOf types.str; 117 - default = ["r:/run/rspamd.sock"]; 118 description = '' 119 Spamd socket definitions. 120 Is server name is prefixed with r: it is rspamd server. ··· 197 198 serviceConfig = { 199 ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; 200 - ExecReload = "/bin/kill -USR1 $MAINPID"; 201 User = cfg.user; 202 Group = cfg.group; 203 PermissionsStartOnly = true; ··· 212 description = "Rmilter service socket"; 213 wantedBy = [ "sockets.target" ]; 214 socketConfig = { 215 - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; 216 - SocketUser = cfg.user; 217 - SocketGroup = cfg.group; 218 - SocketMode = "0660"; 219 }; 220 }; 221
··· 75 76 bindUnixSockets = mkOption { 77 type = types.listOf types.str; 78 + default = ["/run/rmilter/rmilter.sock"]; 79 description = '' 80 Unix domain sockets to listen for MTA requests. 81 ''; ··· 114 115 servers = mkOption { 116 type = types.listOf types.str; 117 + default = ["r:/run/rspamd/rspamd.sock"]; 118 description = '' 119 Spamd socket definitions. 120 Is server name is prefixed with r: it is rspamd server. ··· 197 198 serviceConfig = { 199 ExecStart = "${pkgs.rmilter}/bin/rmilter ${optionalString cfg.debug "-d"} -n -c ${rmilterConfigFile}"; 200 + ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; 201 User = cfg.user; 202 Group = cfg.group; 203 PermissionsStartOnly = true; ··· 212 description = "Rmilter service socket"; 213 wantedBy = [ "sockets.target" ]; 214 socketConfig = { 215 + ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; 216 + SocketUser = cfg.user; 217 + SocketGroup = cfg.group; 218 + SocketMode = "0666"; 219 }; 220 }; 221