X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fmail%2Fdefault.nix;h=fd6d638a843e7fa08e8073d0e5d89227d826b231;hb=850adcf4b17afb6f5429b030f3c814d502d2b53e;hp=a617934c4c09aed7b059cd621ca353ecf67eca61;hpb=deca5e9bf0cfd02c52c39e051753aeb9640a66f3;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/mail/default.nix b/modules/private/mail/default.nix
index a617934..fd6d638 100644
--- a/modules/private/mail/default.nix
+++ b/modules/private/mail/default.nix
@@ -1,27 +1,43 @@
-{ lib, pkgs, config,  ... }:
+{ lib, pkgs, config, ... }:
 {
   imports = [
     ./milters.nix
     ./postfix.nix
     ./dovecot.nix
+    ./relay.nix
     ./rspamd.nix
     ./opensmtpd.nix
+    ./sympa.nix
   ];
   options.myServices.mail.enable = lib.mkEnableOption "enable Mail services";
   options.myServices.mailRelay.enable = lib.mkEnableOption "enable Mail relay services";
+  options.myServices.mailBackup.enable = lib.mkEnableOption "enable MX backup services";
 
   config = lib.mkIf config.myServices.mail.enable {
     security.acme.certs."mail" = config.myServices.certificates.certConfig // {
-      domain = "eldiron.immae.eu";
+      domain = config.hostEnv.fqdn;
       extraDomains = let
         zonesWithMx = builtins.filter (zone:
           lib.attrsets.hasAttr "withEmail" zone && lib.lists.length zone.withEmail > 0
         ) config.myEnv.dns.masterZones;
-        mxs = map (zone: "mx-1.${zone.name}") zonesWithMx;
+        mxs = map (zone: "${config.hostEnv.mx.subdomain}.${zone.name}") zonesWithMx;
+      in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs);
+    };
+    # This is for clients that don’t support elliptic curves (e.g.
+    # printer)
+    security.acme.certs."mail-rsa" = config.myServices.certificates.certConfig // {
+      domain = config.hostEnv.fqdn;
+      keyType = "rsa4096";
+      extraDomains = let
+        zonesWithMx = builtins.filter (zone:
+          lib.attrsets.hasAttr "withEmail" zone && lib.lists.length zone.withEmail > 0
+        ) config.myEnv.dns.masterZones;
+        mxs = map (zone: "${config.hostEnv.mx.subdomain}.${zone.name}") zonesWithMx;
       in builtins.listToAttrs (map (mx: lib.attrsets.nameValuePair mx null) mxs);
     };
     services.duplyBackup.profiles = {
       mail = {
+        remotes = [ "eriomem" "ovh" ];
         rootDir = "/var/lib";
         excludeFile = lib.mkAfter ''
           + /var/lib/vhost
@@ -29,5 +45,8 @@
           '';
       };
     };
+    systemd.slices.mail = {
+      description = "Mail slice";
+    };
   };
 }