Add external dkim domains

10 files changed, 15 insertions, 9 deletions

diff --git a/flakes/private/borg_backup/flake.lock b/flakes/private/borg_backup/flake.lock
index 4d620ad..965a940 100644
--- a/flakes/private/borg_backup/flake.lock
+++ b/flakes/private/borg_backup/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/chatons/flake.lock b/flakes/private/chatons/flake.lock
index 1e163a2..ca16714 100644
--- a/flakes/private/chatons/flake.lock
+++ b/flakes/private/chatons/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/environment/flake.nix b/flakes/private/environment/flake.nix
index 389a601..c389105 100644
--- a/flakes/private/environment/flake.nix
+++ b/flakes/private/environment/flake.nix
@@ -610,6 +610,11 @@
                     };
                   };
                 };
+                additional-dkim-domains = mkOption {
+                  description = "Domains not handled by NS allowed to send e-mails";
+                  type = listOf str;
+                  default = [];
+                };
                 dkim = mkOption {
                   description = "DKIM configuration";
                   type = attrsOf (submodule {
diff --git a/flakes/private/mail-relay/flake.lock b/flakes/private/mail-relay/flake.lock
index 4d620ad..965a940 100644
--- a/flakes/private/mail-relay/flake.lock
+++ b/flakes/private/mail-relay/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/milters/flake.lock b/flakes/private/milters/flake.lock
index 6891e49..77427f4 100644
--- a/flakes/private/milters/flake.lock
+++ b/flakes/private/milters/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/milters/flake.nix b/flakes/private/milters/flake.nix
index fc088f9..eefe2b2 100644
--- a/flakes/private/milters/flake.nix
+++ b/flakes/private/milters/flake.nix
@@ -57,7 +57,8 @@
               let
                 getDomains = p: lib.mapAttrsToList (n: v: v.fqdn) p.emailPolicies;
                 bydomain = builtins.mapAttrs (n: getDomains) nodes.eldiron.config.myServices.dns.zones;
-                domains' = lib.flatten (builtins.attrValues bydomain);
+                domains' = lib.flatten (builtins.attrValues bydomain)
+                  ++ config.myEnv.mail.additional-dkim-domains;
               in
                 builtins.concatStringsSep "," domains';
             keyPath = config.secrets.fullPaths."opendkim";
diff --git a/flakes/private/monitoring/flake.lock b/flakes/private/monitoring/flake.lock
index cdba7c2..eeff363 100644
--- a/flakes/private/monitoring/flake.lock
+++ b/flakes/private/monitoring/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock
index 15fea39..6947cd3 100644
--- a/flakes/private/opendmarc/flake.lock
+++ b/flakes/private/opendmarc/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/ssh/flake.lock b/flakes/private/ssh/flake.lock
index 4d620ad..965a940 100644
--- a/flakes/private/ssh/flake.lock
+++ b/flakes/private/ssh/flake.lock
@@ -3,7 +3,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },
diff --git a/flakes/private/system/flake.lock b/flakes/private/system/flake.lock
index a675105..7754eec 100644
--- a/flakes/private/system/flake.lock
+++ b/flakes/private/system/flake.lock
@@ -19,7 +19,7 @@
     "environment": {
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-xrpwkilnPpT6TklQVoLrID8tWUZAH4PJ5XqhRHXGbvo=",
+        "narHash": "sha256-PQ5694ARRlpj00lk/C/T0UPGhPO+n0TEcLR1mde0s8M=",
         "path": "../environment",
         "type": "path"
       },