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

Merge pull request #47180 from avnik/fix/rmilter

Browse Source 
Fix rmilter socket path, add deprecation notice
This commit is contained in:
Jörg Thalheim 2018-09-24 01:40:13 +01:00 committed by GitHub
commit 5e5cd96189
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ in
bindSocket.path = mkOption { bindSocket.path = mkOption {
type = types.str; type = types.str;
default = "/run/rmilter/rmilter.sock"; default = "/run/rmilter.sock";
description = '' description = ''
Path to Unix domain socket to listen on. Path to Unix domain socket to listen on.
''; '';
@ -193,6 +193,9 @@ in
config = mkMerge [ config = mkMerge [
(mkIf cfg.enable { (mkIf cfg.enable {
warnings = [
''`config.services.rmilter' is deprecated, `rmilter' deprecated and unsupported by upstream, and will be removed from next releases. Use built-in rspamd milter instead.''
];
users.users = singleton { users.users = singleton {
name = cfg.user; name = cfg.user;