nixos/postfix: undo deprecation of extraConfig, extraMasterConf

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

View file

@ -836,11 +836,5 @@ in
(mkIf (cfg.dnsBlacklists != []) {
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." ];
})
]);
}