Follow recommendations for mta-sts formatting

[perso/Immae/Config/Nix.git] / modules / private / websites / tools / mail / mta-sts.nix

diff --git a/modules/private/websites/tools/mail/mta-sts.nix b/modules/private/websites/tools/mail/mta-sts.nix
index d443f55115710f8573ff326795605e0fedded54e..c5f71f03b616de1aec47333751a9799ffffeb350 100644 (file)
--- a/modules/private/websites/tools/mail/mta-sts.nix
+++ b/modules/private/websites/tools/mail/mta-sts.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
   domains = (lib.remove null (lib.flatten (map
     (zone: map
@@ -11,17 +11,18 @@ let
       )
       (zone.withEmail or [])
     )
-    myconfig.env.dns.masterZones
+    config.myEnv.dns.masterZones
   )));
+  mxes = lib.mapAttrsToList
+    (n: v: v.mx.subdomain)
+    (lib.attrsets.filterAttrs (n: v: v.mx.enable) config.myEnv.servers);
   # FIXME: increase the id number in modules/private/dns.nix when this
   # file change (date -u +'%Y%m%d%H%M%S'Z)
-  file = domain: pkgs.writeText "mta-sts-${domain.domain}.txt" ''
-    version: STSv1
-    mode: testing
-    mx: mx-1.${domain.mail}
-    mx: mx-2.${domain.mail}
-    max_age: 604800
-    '';
+  file = domain: pkgs.writeText "mta-sts-${domain.domain}.txt" (
+    builtins.concatStringsSep "\r\n" ([ "version: STSv1" "mode: testing" ]
+    ++ (map (v: "mx: ${v}.${domain.mail}") mxes)
+    ++ [ "max_age: 604800" ]
+    ));
   root = pkgs.runCommand "mta-sts_root" {} ''
     mkdir -p $out
     ${builtins.concatStringsSep "\n" (map (d:
@@ -32,7 +33,7 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    myServices.websites.webappDirs = {
+    services.websites.webappDirs = {
       _mta-sts = root;
     };