Use list for ip4 addresses

[perso/Immae/Config/Nix.git] / modules / private / dns.nix

diff --git a/modules/private/dns.nix b/modules/private/dns.nix
index 1d7fd52fb3fe6e11d27ea801da4f0518ee719069..120c46c3d020faa052045ef26755564a98524b90 100644 (file)
--- a/modules/private/dns.nix
+++ b/modules/private/dns.nix
@@ -75,7 +75,7 @@
       (n: v: v.mx.enable)
       config.myEnv.servers;
     ip4mxes = builtins.concatStringsSep "\n" (lib.mapAttrsToList
-      (n: v: "${v.mx.subdomain} IN A     ${v.ips.main.ip4}")
+      (n: v: builtins.concatStringsSep "\n" (map (i: "${v.mx.subdomain} IN A     ${i}") v.ips.main.ip4))
       mxes);
     ip6mxes = builtins.concatStringsSep "\n" (lib.mapAttrsToList
       (n: v: builtins.concatStringsSep "\n" (map (i: "${v.mx.subdomain} IN AAAA  ${i}") v.ips.main.ip6))
@@ -108,7 +108,7 @@
         allow-recursion { 127.0.0.1; };
         allow-transfer  { none; };
 
-        notify-source    ${config.myEnv.servers.eldiron.ips.main.ip4};
+        notify-source    ${lib.head config.myEnv.servers.eldiron.ips.main.ip4};
         notify-source-v6 ${lib.head config.myEnv.servers.eldiron.ips.main.ip6};
         version   none;
         hostname  none;
@@ -169,7 +169,7 @@
               ; https://support.google.com/a/answer/9261504
               _mta-sts${suffix}   IN TXT  "v=STSv1;id=20200109150200Z"
               _smtp._tls${suffix} IN TXT  "v=TLSRPTv1;rua=mailto:postmaster+mta-sts@immae.eu"
-              mta-sts${suffix}    IN A    ${config.myEnv.servers.eldiron.ips.main.ip4}
+              ${builtins.concatStringsSep "\n" (map (i: "mta-sts${suffix}    IN A    ${i}") config.myEnv.servers.eldiron.ips.main.ip4)}
               ${builtins.concatStringsSep "\n" (map (i: "mta-sts${suffix}    IN AAAA ${i}") config.myEnv.servers.eldiron.ips.main.ip6)}
 
               ; Mail sender authentications