diff options
| author | Ryan Hendrickson <ryan.hendrickson@alum.mit.edu> | 2017-10-23 11:57:20 -0400 |
|---|---|---|
| committer | Joachim Schiele <js@lastlog.de> | 2017-10-23 17:57:20 +0200 |
| commit | c522aaafde483a7c0127eab008b1274de8fd4fda (patch) | |
| tree | 76c79e61c099918812b716be78898dcb26701610 | |
| parent | 48d2b58417915f4fc1849bf1830500b42f31e73e (diff) | |
| download | nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar.gz nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar.bz2 nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar.lz nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar.xz nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.tar.zst nixlib-c522aaafde483a7c0127eab008b1274de8fd4fda.zip | |
nixos/postfix: allow dollar parameters in lists (#30612)
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 8 | ||||
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 47522fe3cc92..6fa14b553862 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -55,7 +55,13 @@ following incompatible changes:</para> <itemizedlist> <listitem> - <para></para> + <para> + Dollar signs in options under <option>services.postfix</option> are + passed verbatim to Postfix, which will interpret them as the beginning of + a parameter expression. This was already true for string-valued options + in the previous release, but not for list-valued options. If you need to + pass literal dollar signs through Postfix, double them. + </para> </listitem> </itemizedlist> diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index ad4e58149847..2185484827de 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -28,7 +28,7 @@ let mainCf = let escape = replaceStrings ["$"] ["$$"]; - mkList = items: "\n " + concatMapStringsSep "\n " escape items; + mkList = items: "\n " + concatStringsSep "\n " items; mkVal = value: if isList value then mkList value else " " + (if value == true then "yes" |