nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-06 12:14:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/postfix: undo deprecation of extraConfig, extraMasterConf

Browse Source 
I realize that advanced users like to configure services with Nix
attrsets, but I don't think we should remove the option to use the
(configuration) language provided by upstream.
This commit is contained in:
Bjørn Forsman 2017-09-02 09:50:21 +02:00 committed by Robin Gloster
parent 56ccd27dee
commit eed14baec3
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/modules/services/mail/postfix.nix
View File

@ -836,11 +836,5 @@ in
(mkIf (cfg.dnsBlacklists != []) { (mkIf (cfg.dnsBlacklists != []) {
services.postfix.mapFiles."client_access" = checkClientAccessFile; services.postfix.mapFiles."client_access" = checkClientAccessFile;
}) })
(mkIf (cfg.extraConfig != "") {
warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ];
})
(mkIf (cfg.extraMasterConf != "") {
warnings = [ "The services.postfix.extraMasterConf option was deprecated. Please use services.postfix.masterConfig instead." ];
})
]); ]);
} }