diff options
| author | sshisk <satoshi.shishiku@tuta.io> | 2017-07-30 12:37:51 +0300 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2017-07-30 11:37:51 +0200 |
| commit | e79d11b623cc956053b9052ee6655d732d193567 (patch) | |
| tree | b9c6009c34ebfb22950eb71391b601d771d66ef8 /nixos/modules/services/mail | |
| parent | 25bb529245b029f53df6b15b94fcbe9de58017fb (diff) | |
| download | nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar.gz nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar.bz2 nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar.lz nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar.xz nixlib-e79d11b623cc956053b9052ee6655d732d193567.tar.zst nixlib-e79d11b623cc956053b9052ee6655d732d193567.zip | |
postfix service: fix extraMasterConf (#27755)
thanks
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 845c6acc7feb..c22a552645a9 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -267,7 +267,7 @@ let lines = [ sep (formatLine labels) (formatLine labelDefaults) sep ]; in concatStringsSep "\n" lines; - in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n"; + in formattedLabels + "\n" + concatMapStringsSep "\n" formatLine masterCf + "\n" + cfg.extraMasterConf; headerCheckOptions = { ... }: { @@ -839,5 +839,8 @@ in (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." ]; + }) ]); } |