Add mail autoconfiguration

[perso/Immae/Config/Nix.git] / systems / eldiron / dns.nix

diff --git a/systems/eldiron/dns.nix b/systems/eldiron/dns.nix
index 7645b69494261501914de5d40f80e977234104a8..3d5aafa4401707fcff2b93ac5cf81fbf1e5df8a2 100644 (file)
--- a/systems/eldiron/dns.nix
+++ b/systems/eldiron/dns.nix
@@ -50,7 +50,11 @@ in
           };
         };
         mailSend = {
-          # DKIM
+          # DKIM 2048b
+          subdomains._domainkey.subdomains.eldiron2.TXT = [
+            (toKV config.myEnv.mail.dkim.eldiron2.public)
+          ];
+          # DKIM 1024b
           subdomains._domainkey.subdomains.eldiron.TXT = [
             (toKV config.myEnv.mail.dkim.eldiron.public)
           ];
@@ -89,6 +93,11 @@ in
             # DMARC
             # p needs to be the first tag
             _dmarc.TXT = [ (toKV { _00__v = "DMARC1"; _01__p = if quarantine then "quarantine" else "none"; adkim = "s"; aspf = "s"; fo = "1"; rua = "mailto:postmaster+rua@immae.eu"; ruf = "mailto:postmaster+ruf@immae.eu"; }) ];
+
+            # Autoconfiguration for Outlook
+            autodiscover = ips servers.eldiron.ips.main;
+            # Autoconfiguration for Mozilla
+            autoconfig = ips servers.eldiron.ips.main;
           };
 
           # SPF
@@ -303,6 +312,10 @@ in
         install -dm755 -o named /var/lib/named/dnssec_keys
       '');
     myServices.monitoring.fromMasterActivatedPlugins = [ "dns" ];
+    myServices.monitoring.fromMasterObjects.contactgroup.dns-raito = {
+      alias = "Secondary DNS Raito";
+      members = "immae";
+    };
     myServices.monitoring.fromMasterObjects.service = lib.mkMerge (lib.mapAttrsToList (name: z:
       lib.optional (builtins.elem "immae" z.ns) {
         service_description = "eldiron dns is active and authoritative for ${name}";
@@ -319,6 +332,7 @@ in
           host_name = config.hostEnv.fqdn;
           use = "dns-service";
           check_command = ["check_external_dns" "kurisu.dual.lahfa.xyz" name "-A"];
+          contact_groups = "dns-raito";
 
           servicegroups = "webstatus-dns";
           _webstatus_name = "${name} (Secondary DNS Raito)";
@@ -328,6 +342,7 @@ in
           host_name = config.hostEnv.fqdn;
           use = "dns-service";
           check_command = ["check_dns_soa" "kurisu.dual.lahfa.xyz" name config.hostEnv.fqdn];
+          contact_groups = "dns-raito";
 
           servicegroups = "webstatus-dns";
           _webstatus_name = "${name} (Secondary DNS Raito up to date)";