diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-28 06:03:01 +0200 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-28 06:22:23 +0200 |
commit | d23521b16cf12bb94865c34673fc8317270da54c (patch) | |
tree | f7e97ce4a6188782a0d3e82c15a6df1d6556b647 /nixos/modules | |
parent | 63784b8021115250663a551f49e3da42fe566b0e (diff) | |
download | nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar.gz nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar.bz2 nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar.lz nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar.xz nixlib-d23521b16cf12bb94865c34673fc8317270da54c.tar.zst nixlib-d23521b16cf12bb94865c34673fc8317270da54c.zip |
rmilter service: use runtime dirctory for socket
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/services/mail/rmilter.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nixos/modules/services/mail/rmilter.nix b/nixos/modules/services/mail/rmilter.nix index d1f7cd2e173e..e27b38bc0e2e 100644 --- a/nixos/modules/services/mail/rmilter.nix +++ b/nixos/modules/services/mail/rmilter.nix @@ -75,7 +75,7 @@ in bindUnixSockets = mkOption { type = types.listOf types.str; - default = ["/run/rmilter.sock"]; + default = ["/run/rmilter/rmilter.sock"]; description = '' Unix domain sockets to listen for MTA requests. ''; @@ -114,7 +114,7 @@ in servers = mkOption { type = types.listOf types.str; - default = ["r:/run/rspamd.sock"]; + default = ["r:/run/rspamd/rspamd.sock"]; description = '' Spamd socket definitions. Is server name is prefixed with r: it is rspamd server. @@ -197,7 +197,7 @@ milter_default_action = accept serviceConfig = { 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; Group = cfg.group; PermissionsStartOnly = true; @@ -212,10 +212,10 @@ milter_default_action = accept description = "Rmilter service socket"; wantedBy = [ "sockets.target" ]; socketConfig = { - ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; - SocketUser = cfg.user; - SocketGroup = cfg.group; - SocketMode = "0660"; + ListenStream = cfg.bindUnixSockets ++ cfg.bindInetSockets; + SocketUser = cfg.user; + SocketGroup = cfg.group; + SocketMode = "0666"; }; }; |