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

postfix service: fix extraMasterConf (#27755) 

thanks
This commit is contained in:
sshisk 2017-07-30 12:37:51 +03:00 committed by Joachim Schiele
parent 25bb529245
commit e79d11b623
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/postfix.nix
View File

@ -267,7 +267,7 @@ let
lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ]; lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ];
in concatStringsSep "\n" lines; in concatStringsSep "\n" lines;
in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n"; in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf;
headerCheckOptions = { ... }: headerCheckOptions = { ... }:
{ {
@ -839,5 +839,8 @@ in
(mkIf (cfg.extraConfig != "") { (mkIf (cfg.extraConfig != "") {
warnings = [ "The services.postfix.extraConfig option was deprecated. Please use services.postfix.config instead." ]; 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." ];
})
]); ]);
} }