diff options
| author | Bjørn Forsman <bjorn.forsman@gmail.com> | 2017-09-02 09:50:21 +0200 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-09-07 21:41:29 +0200 |
| commit | eed14baec3db43df7294d3b549045c7298044eb4 (patch) | |
| tree | b37b4af3e75b0ba578c9be13ee09574eff14bb75 /nixos/modules/services/mail | |
| parent | 56ccd27dee7bd44c9a660274a82d05d92f94c214 (diff) | |
| download | nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar.gz nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar.bz2 nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar.lz nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar.xz nixlib-eed14baec3db43df7294d3b549045c7298044eb4.tar.zst nixlib-eed14baec3db43df7294d3b549045c7298044eb4.zip | |
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.
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 01ae49d49090..d88a38def82c 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -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." ]; - }) ]); } |