diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-26 14:01:15 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2018-01-26 14:10:17 +0100 |
| commit | cb7fe51ee696fc94b918b4dee6c7b27e61766769 (patch) | |
| tree | ce4649e42001ab0e909c2f06b8cd67bc4ba1930c /nixos/modules/services/mail | |
| parent | 9bd7798d9cf166ee7c02ab9e13219f76766324cb (diff) | |
| download | nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar.gz nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar.bz2 nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar.lz nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar.xz nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.tar.zst nixlib-cb7fe51ee696fc94b918b4dee6c7b27e61766769.zip | |
nixos/postfix: separate list option elements with commas
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index e92dbe93b533..22af7e876af2 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -15,20 +15,18 @@ let haveVirtual = cfg.virtual != ""; clientAccess = - if (cfg.dnsBlacklistOverrides != "") - then [ "check_client_access hash:/etc/postfix/client_access" ] - else []; + optional (cfg.dnsBlacklistOverrides != "") + "check_client_access hash:/etc/postfix/client_access"; dnsBl = - if (cfg.dnsBlacklists != []) - then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ] - else []; + optionals (cfg.dnsBlacklists != []) + (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists); clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl); mainCf = let escape = replaceStrings ["$"] ["$$"]; - mkList = items: "\n " + concatStringsSep "\n " items; + mkList = items: "\n " + concatStringsSep ",\n " items; mkVal = value: if isList value then mkList value else " " + (if value == true then "yes" |