From fec220bab5850ece3e6432e6583e5a3c420608cf Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Fri, 21 Mar 2025 19:31:17 +0100
Subject: [PATCH] thrall: Fix sending mails from kobjolke.de

---
 hosts/thrall/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index cc61900..ec4a885 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -426,18 +426,20 @@ in
         aliases = [
           "lx@failco.de"
           "alex@failco.de"
+          "abuse@failco.de"
+          "postmaster@failco.de"
+          "abuse@kobjolke.de"
+          "postmaster@kobjolke.de"
+          "abuse@jakalx.net"
+          "postmaster@jakalx.net"
         ];
 
         catchAll = [
-          "failco.de"
-          "kobjolke.de"
         ];
       };
 
       "alex@jakalx.net" = {
         hashedPasswordFile = config.age.secrets.mailPass.path;
-
-        catchAll = [ "jakalx.net" ];
       };
 
       "archive@failco.de" = {
@@ -446,12 +448,16 @@ in
     };
 
     extraVirtualAliases = {
-      "familie@kobjolke.de" = [ "me@failco.de" ];
+      "alex@kobjolke.de" = [ "me@failco.de" ];
     };
 
     forwards = {
-      "anne@kobjolke.de" = "anne.kobjolke@gmail.cem";
-      "alex@kobjolke.de" = "me@failco.de";
+      "familie@kobjolke.de" = [
+        "alex@kobjolke.de"
+        "anne@kobjolke.de"
+      ];
+      "anne@kobjolke.de" = "anne.kobjolke@gmail.com";
+      "alexander@kobjolke.de" = "alex@kobjolke.de";
     };
 
     certificateScheme = "acme-nginx";