From d758248ea0a051a8847972934b506ad694048281 Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jurnwubben@gmail.com>
Date: Wed, 11 Jun 2025 21:23:55 +0200
Subject: [PATCH] Gave up on manually creating config. Creating temporary
 docker container and then stealing config.

---
 secrets/mail-admin.age | Bin 649 -> 649 bytes
 system/server/mail.nix |  25 +++++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/secrets/mail-admin.age b/secrets/mail-admin.age
index 457b7cd9aa8f7e6ea1cb52866f3c5a0909d76d25..494156fcc12b44a28cc9d5803f4ccbc6c8894a19 100644
GIT binary patch
delta 578
zcmeBV?PQ&xQy<`M9AJ_jY2e~p?vfXkpHx+7>J^+E7F<y1s+}92UXttX>S$=16Iong
zz-8v^6>5}eR9GHtY@X{E8SHKz5M~h=mRMwz<8S0zl;fUhm|ak1o|Kzh&ZTRoP+Xj$
zo0?)|YHDbyV6I=48CkC2n^qZW;F|3g6qHt0nh}<1=~fbCk!;~@kYZdCXliaA8D!=k
z5~-hR;AK?KWfo~@YFJ?&?&_0Pkdl@gn&+G2Y2cA)>0<0{?2#F1mL8OmlTn%FAM9K_
z@uPUScW9cIfuXihc7$KBlc}M1P*9X{L4>zgVL@<aa<)lkszI2KlV_2yi(x32Ut)=S
zYGR2&a%EA3hlzfKacPKtKzLzFrEgM{Wuc|Ef0jvTPFikdu#v^&ct-JhW3N2pwDcsG
zh|CbDV!v|d5>r=;BromYJSV5b(Bw3IgDn5@;Glx+DraA=bkCHCLhsa|)a**<e3y{Q
zA|JmzXZ>W8$e<`UZ%@wvv&@S0(9)2q2=8JpU0q!T%WR`;?NYPgd<*~VqQF4k^uS{C
z(ugWAH{Xh+WYe^);GB&5q-;wgld3cWF6S-D`+l*yZ;;-6LGJL>Tg!^hRg@IW;tHL7
zT5IZ$+o3^A#s4<WXke3FX8EnZR)TMVv-$3Tx`5!#AMzGW4pX+^G5@P8acI*=)-#We
ze~GM^CA)rl+={n*bmqkNiF%Y~7cFY2FMG;2r@?FGnzc*rwra?Be5_fP;40c6RR2QV
VVSn#L<|wbwqV!+Oi(Pdd0RZjg(Zc`$

delta 578
zcmeBV?PQ&xQ=e2=QI+Kx=3-!4<yRH#7!l<j=9_FDk`_@GoEDUt?&=?*t?y|XRpyr+
z$(50rY?=}t6y@sc<`-sKQeu!1>Qj;AlI>b#VNf3GW?<-K;bu}5l4+b_z@=-aP+Xj$
zo0?)|YHDbyV6I=48Ck9n;p`DqS?XbC;^&oanr0N0=~fn=S!59C<y{a|ZkB727E$3G
zRb}91lp5&EWm=Tv7!}~>9#N9&ZfIg0QeGBR6`b!?Xj)L<?`>x2Uyv9anUfNd>=R)y
z@uPTnT9&bKQh7wUi+*Cdql>wIX>veOMR`eLRC2mUT2#4zX=qNEf2d<hs!=&thH;jG
zNqTamqghF^S5!(;az;`{pl7hLU%9t`QG{zoj+=Q^VPu4Mo?r6hct-L1fT|?dV$YIN
zr*iF7lk~(O@7!<`{fxYnaDRj1l*BOC%yi2Vr+j12Oy^>*N|Q`~Xa7p4>|oEra{Y9_
zy!4XD2$PIN10Sb|ve5h_Pm6L-|13)vC*w#iU0q#;2>%NA;Ia_Ql%jH9Lo*kr$|#Ev
z)5N^ADyMYs$n+4yRCCXI$1rWToc!ECE}gY`kMI1PygNeRv5yUhS9|xAisk#?JUcoo
z?o;ucpoldIP0PDNYksU0G`aZiu2P~UYs8rr;ryirRS9o4Fob?{*L(dl;KFo22Lb1h
z78RCneDiiI%=K4)JT+wF@|5Cv-;&Ohb}tXPJMHs<_lYf9ia(08RnDgUo+`R2Xl8Sx
Va_;-Ay0$Q{tLN_cEn;Bu1OR2m*1-S(

diff --git a/system/server/mail.nix b/system/server/mail.nix
index b4b51ca..5bad57f 100644
--- a/system/server/mail.nix
+++ b/system/server/mail.nix
@@ -6,11 +6,9 @@
       user_admin_password = config.age.secrets.mail-admin.path;
     };
     settings = {
-      authentication = {
-        fallback-admin = {
-          secret = "%{file:/run/credentials/stalwart-mail.service/user_admin_password}%";
-          user = "admin";
-        };
+      authentication.fallback-admin = {
+        secret = "%{file:/run/credentials/stalwart-mail.service/user_admin_password}%";
+        user = "admin";
       };
       server = {
         tracer."log" = {
@@ -45,16 +43,12 @@
       };
 
       hostname = "mx1.jsw.tf";
-      lookup.default = {
-        hostname = "mx1.jsw.tf";
-        domain = "jsw.tf";
-      };
+      lookup.default.domain = "jsw.tf";
       acme."letsencrypt" = {
         directory = "https://acme-v02.api.letsencrypt.org/directory";
         challenge = "tls-alpn-01";
         contact = ["jurnwubben@gmail.com"];
         domains = ["jsw.tf" "mx1.jsw.tf"];
-        cache = "%{BASE_PATH}%/etc/acme";
         renew-before = "30d";
       };
       directory."imap".lookup.domains = ["jsw.tf"];
@@ -71,6 +65,17 @@
       # };
     };
   };
+
+  # virtualisation.oci-containers.containers.stalwart = {
+  #   image = "docker.io/stalwartlabs/mail-server:latest";
+  #   labels = {
+  #     "io.containers.autoupdate" = "registry";
+  #   };
+  #   ports = ["25:25" "465:465" "993:993" "9003:8080"];
+  #   volumes = [
+  #     "/home/jsw/stalwart:/opt/stalwart-mail"
+  #   ];
+  # };
   networking.firewall.allowedTCPPorts = [
     993
     25