From edd4a0efe3daf137c043275062581a9ae8ac8a1e Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 20:40:59 -0400 Subject: [PATCH 1/3] postfix: fix typo in transport_maps path --- nixos/modules/services/mail/postfix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 845c6acc7fe..47ce2c4c5e3 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -76,7 +76,7 @@ let // optionalAttrs (cfg.relayDomains != null) { relay_domains = cfg.relayDomains; } // optionalAttrs (cfg.recipientDelimiter != "") { recipient_delimiter = cfg.recipientDelimiter; } // optionalAttrs haveAliases { alias_maps = "${cfg.aliasMapType}:/etc/postfix/aliases"; } - // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfx/transport"; } + // optionalAttrs haveTransport { transport_maps = "hash:/etc/postfix/transport"; } // optionalAttrs haveVirtual { virtual_alias_maps = "${cfg.virtualMapType}:/etc/postfix/virtual"; } // optionalAttrs (cfg.dnsBlacklists != []) { smtpd_client_restrictions = clientRestrictions; } // optionalAttrs cfg.enableHeaderChecks { header_checks = "regexp:/etc/postfix/header_checks"; } From 01fbf30041d1ee0c3ad819fe59389eadc92d9ac4 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 21:10:00 -0400 Subject: [PATCH 2/3] postfix: warn about deprecated extraMasterConf option --- nixos/modules/services/mail/postfix.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 47ce2c4c5e3..a3e60cfecad 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -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." ]; + }) ]); } From 9186dda4a9a519aeb73b68358ff9e4af911647c3 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Thu, 10 Aug 2017 21:22:28 -0400 Subject: [PATCH 3/3] postfix: wakeup value should be used even if wakeupUnusedComponent is not defined --- nixos/modules/services/mail/postfix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index a3e60cfecad..cc17db103a0 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -213,8 +213,8 @@ let wakeupDefined = options.wakeup.isDefined; wakeupUCDefined = options.wakeupUnusedComponent.isDefined; finalValue = toString config.wakeup - + optionalString (!config.wakeupUnusedComponent) "?"; - in if wakeupDefined && wakeupUCDefined then finalValue else "-"; + + optionalString (wakeupUCDefined && !config.wakeupUnusedComponent) "?"; + in if wakeupDefined then finalValue else "-"; in [ config.name