Add backup MX

2 files changed, 5 insertions, 3 deletions

diff --git a/modules/private/websites/tools/git/mantisbt.nix b/modules/private/websites/tools/git/mantisbt.nix
index d0d7a98..8606819 100644
--- a/modules/private/websites/tools/git/mantisbt.nix
+++ b/modules/private/websites/tools/git/mantisbt.nix
@@ -31,7 +31,7 @@ rec {
       $g_from_email             = 'mantisbt@tools.immae.eu';
       $g_return_path_email      = 'mantisbt@tools.immae.eu';
       $g_from_name              = 'Mantis Bug Tracker at git.immae.eu';
-      $g_email_receive_own      = OFF;
+      $g_email_receive_own      = ON;
       # --- LDAP ---
       $g_login_method = LDAP;
       $g_ldap_protocol_version = 3;
diff --git a/modules/private/websites/tools/mail/mta-sts.nix b/modules/private/websites/tools/mail/mta-sts.nix
index a401b41..ed3fce8 100644
--- a/modules/private/websites/tools/mail/mta-sts.nix
+++ b/modules/private/websites/tools/mail/mta-sts.nix
@@ -13,13 +13,15 @@ let
     )
     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}
+    ${builtins.concatStringsSep "\n" (map (v: "mx: ${v}.${domain.mail}") mxes)}
     max_age: 604800
     '';
   root = pkgs.runCommand "mta-sts_root" {} ''