diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-02-06 03:50:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 03:50:05 +0300 |
| commit | 9beeee2717d2b4dc3147f6221fc6ae9c158e59f8 (patch) | |
| tree | 7507dabaf4586edb3354d40ec300e238dde449b9 /nixos | |
| parent | 9d6f2fd297e90ecacf3292453e43e7114ae3c1a4 (diff) | |
| parent | 52c7e647ab81383c72117800b8cd5cd49bec9030 (diff) | |
| download | nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar.gz nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar.bz2 nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar.lz nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar.xz nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.tar.zst nixpkgs-9beeee2717d2b4dc3147f6221fc6ae9c158e59f8.zip | |
Merge pull request #22431 from abbradar/postfix-local
postfix service: don't empty local_recipient_maps
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1703.xml | 12 | ||||
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index 09358f3af23..be6ad59ac5d 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -46,6 +46,7 @@ following incompatible changes:</para> for what those parameters represent. </para> </listitem> + <listitem> <para> <literal>ansible</literal> now defaults to ansible version 2 as version 1 @@ -54,6 +55,7 @@ following incompatible changes:</para> vulnerability</link> unpatched by upstream. </para> </listitem> + <listitem> <para> <literal>gnome</literal> alias has been removed along with @@ -116,7 +118,6 @@ following incompatible changes:</para> </listitem> <listitem> - <para><literal>overridePackages</literal> function no longer exists. It is replaced by <link xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install"> @@ -153,6 +154,15 @@ following incompatible changes:</para> </para> </listitem> + <listitem> + <para> + <literal>local_recipient_maps</literal> is not set to empty value by + Postfix service. It's an insecure default as stated by Postfix + documentation. Those who want to retain this setting need to set it via + <literal>services.postfix.extraConfig</literal>. + </para> + </listitem> + </itemizedlist> diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index cdde4144622..caaa87b94d6 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -79,8 +79,6 @@ let relay_domains = ${concatStringsSep ", " cfg.relayDomains} '' + '' - local_recipient_maps = - relayhost = ${if cfg.lookupMX || cfg.relayHost == "" then cfg.relayHost else |