From 83f42517b3333a3c3aee14009a0d27f2a6c5cfc7 Mon Sep 17 00:00:00 2001 From: oddlama Date: Sat, 13 Apr 2024 14:32:32 +0200 Subject: [PATCH] fix: remove typo in maddy config, add maddy to acme group --- hosts/envoy/acme.nix | 2 +- hosts/envoy/maddy.nix | 4 +++- hosts/envoy/secrets/local.nix.age | Bin 786 -> 842 bytes modules/config/users.nix | 1 + users/myuser/secrets/user.nix.age | Bin 4847 -> 4820 bytes 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/hosts/envoy/acme.nix b/hosts/envoy/acme.nix index f818396..65a2986 100644 --- a/hosts/envoy/acme.nix +++ b/hosts/envoy/acme.nix @@ -22,7 +22,7 @@ in { }; dnsProvider = "cloudflare"; dnsPropagationCheck = true; - reloadServices = ["nginx"]; + reloadServices = ["nginx" "maddy"]; }; inherit (acme) certs wildcardDomains; }; diff --git a/hosts/envoy/maddy.nix b/hosts/envoy/maddy.nix index b9a6a22..f739916 100644 --- a/hosts/envoy/maddy.nix +++ b/hosts/envoy/maddy.nix @@ -79,6 +79,8 @@ in { ]; networking.firewall.allowedTCPPorts = [25 465 993]; + users.groups.acme.members = ["maddy"]; + services.maddy = { enable = true; hostname = "mx1.${primaryDomain}"; @@ -119,7 +121,7 @@ in { table.chain local_rewrites { optional_step sql_query { - driver sqlite + driver sqlite3 dsn mailboxes.db lookup "SELECT alias FROM aliases WHERE address = $1" } diff --git a/hosts/envoy/secrets/local.nix.age b/hosts/envoy/secrets/local.nix.age index bf125b78bc74e29fd72f35723e4ab8bc4db40f80..30a13cff85f9a8a60dbf85444ecd3024208c37ec 100644 GIT binary patch delta 823 zcmV-71IYZ62FeDIAb(VOPId3Z23Lv2e@Gh#SVPD?>SL1a{LW_5XRQd3h)HdR4qLt|J*YfgAnRSGRW zAaH4REpRe5HXwL$Q)M_&AVDxWaz<)ZV^m5rX<0WmPe)@{F@ITNaWiL7Lv>n5aY{i= zLQ*s_T5EAyS8fVPb2C_HD@#i+N;5Y}QdDzhR99qmG)`n%IaxDLPH;_FH#S3cOJ!6u zb88AMJ|IChEoX9NVRL05Iv{3kLnCc9bRc|cdRrh_K2<+uOA2jvXL2}jdSPloPFXQ^ zZe?+7R!U|}M}K&9NmfQMMOSHhad~S(GFmx!O>JpvFG4YPF-2EdN=`#@OGrUQayT~% zcX>}VL1%Y3ICpeMZ)-AFP(o`$HaSdJVs&jcOj$Tua#(t8FEMgOLuh(cGiZ2FVsu$Y zZFF{Fc2`vjEiEk|RX9dzd3I-RN;oT6F?dUFNiS45OMf#_buV*QQCdh@cSB-UYb#`H zc2Q163S8UQjev{`raYE`x#*#tRRbBN(ngw*viISA`zZRTCGGGMHm=(;Clu7hic;^sFO@rmJE9_cmZ>+qywqu$FF+3l)P&zy zV!Ev;Hh4vn*D>vs5H5Tr?D!ML{yQtz%6x*KBNp}X z=eth)lsj=rcs7BXUy?S-p3P@MyppwiH*bmAY-;sr&fQ1!_Ex%6PQJg(@}ugnQ~nNv zebMLBh7x~kq_9BkpUMVLxQ@v`gs)r6z59M#6yP|P<~8zjBy)6py;nx(D?7z;_U?;^ zIWVRnZwMC%Ij=Me1lr$dCi`yPCJOryp9I_7c(IpB&%_Yn|G6|pX`moTvaL#r&W0$L BR1W|E delta 766 zcmVK%DX*O?qOJzxHGes+EcV|pXM|gEcMM!5a&uL7NoZC=N>x=< zMR+hxS9)T3T3QNWO=wp$PHks1dTC>6VnlOLLoYONZ&!3lFl$qGMPX8KG-_pHZgy*P zVo3@uJ|JpxJzp(na%Ew2WeRUED^@~6bZ&P}IBqaDX>nyvb#QBSMo2|eT0(6#XLMt1 zHfc4&TO>9p}M^-Xfa!+J7GlN9osZTjb(1DYL+oU@<4NJR25^*Lx03JoD?Sl#~omP7e?c%NHYFX zafnRa{R^NO9w@Q9!3nvs)6}_2rqF{j>z`$wi)wLLtwY&gCe!~};@_gnbVU!#tfvVa zasu{Z``?qOVG@A75A>Rj}D*`W?kwDa%5 zvL2%gcF$LzL>>Jo7DLVfcmC-%pN#K>mVjD9a(6Q!1(YViSR5l>Ytk11b>J*fsp4pv w11hw>!X*VC$OJ3%S5%eD$?6v`Kjw|iFUo(?p6?up2Yuy_VbPFF>hL4_s#_>N8UO$Q diff --git a/modules/config/users.nix b/modules/config/users.nix index 5693e9d..8c00826 100644 --- a/modules/config/users.nix +++ b/modules/config/users.nix @@ -30,5 +30,6 @@ fwupd-refresh = uidGid 979; radicale = uidGid 978; podman = uidGid 977; + maddy = uidGid 976; }; } diff --git a/users/myuser/secrets/user.nix.age b/users/myuser/secrets/user.nix.age index 52232d87b5c4f7c18bb7bf442c072db1d4fa0c0e..f59cbd68e1a4f38be715de2cf78b6cfbf6e660b2 100644 GIT binary patch literal 4820 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 uSvM!GZcsKcFF^`xHET3wPfs{+OlwVeD==bt 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 V4}yIAwiu9#0758>B{!sngPlK1Ap-ya