From b63de52f9239a9b91db4ad222945c307158bbac2 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 27 Jul 2024 16:26:07 -0600
Subject: sys/env, sys/pki: generate full list of certs by path

---
 sys/mail/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'sys/mail/default.nix')

diff --git a/sys/mail/default.nix b/sys/mail/default.nix
index 0a888e8..6c1b610 100644
--- a/sys/mail/default.nix
+++ b/sys/mail/default.nix
@@ -92,11 +92,9 @@ in
 
               certLogins =
                 pkgs.writeText "cert-logins"
-                  (concatStrings (flatten (mapAttrsToList
-                    (uuid: names: map
-                      (addr: ''
-                        ${uuid}.mail-client@nodomain,${addr}:::::::user=${names.canonical}
-                      '')
+                  (concatLines (flatten (mapAttrsToList
+                    (certPath: names: map
+                      (addr: "${config.local.pki.byPath.${certPath}.commonName}@nodomain,${addr}:::::::user=${names.canonical}")
                       names.logins)
                     (listToAttrs (localCerts ++ vmailCerts)))));
 
-- 
cgit v1.2.3