From b5e388bfc415710fd068ee642260984e0baa600f Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 23 Oct 2023 21:29:45 +0100
Subject: [PATCH] mailserver: add more accounts

---
 modules/common/secrets/default.nix                     |  4 +++-
 modules/common/secrets/secrets.yaml                    |  6 ++++--
 .../types/server/services/mailserver/default.nix       | 10 ++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/modules/common/secrets/default.nix b/modules/common/secrets/default.nix
index 6ec6ba4cb..2630f85ea 100644
--- a/modules/common/secrets/default.nix
+++ b/modules/common/secrets/default.nix
@@ -34,13 +34,15 @@ in {
       mailserver-vaultwarden = {};
       mailserver-database = {};
       mailserver-grafana = {};
+      mailserver-git = {};
+      mailserver-noreply = {};
+      mailserver-spam = {};
 
       mailserver-grafana-nohash = mkIf services.monitoring.grafana.enable {
         owner = "grafana";
         group = "grafana";
       };
 
-      mailserver-git = {};
       mailserver-git-nohash = mkIf services.forgejo.enable {
         owner = "forgejo";
         group = "forgejo";
diff --git a/modules/common/secrets/secrets.yaml b/modules/common/secrets/secrets.yaml
index ca72db28d..895f76c03 100644
--- a/modules/common/secrets/secrets.yaml
+++ b/modules/common/secrets/secrets.yaml
@@ -5,6 +5,8 @@ mailserver-git-nohash: ENC[AES256_GCM,data:xl+iPzMOhI1M04z6v2ZQdqDPR4jnJwklAdqM9
 mailserver-grafana: ENC[AES256_GCM,data:8jLMabqJ7TkIOJGzYyBkkt+iyc7nXQOGXP+N7TyfRuEKaU0YP+zoAzSv4jM31wQyjl5/QrMvSwE13AS1Vw==,iv:cjkGDdJvT7DrZSB7htgVLp+TsHyFqX0eeFRjB5lbfPI=,tag:7j0tw/39/Z3tUGci2IKTPw==,type:str]
 mailserver-grafana-nohash: ENC[AES256_GCM,data:SAHerwdB0jFI5PNX5Ot9liqVPl0WQn/ZL1xerzODMjLi,iv:/2L/f9rx8pHRiK/4a7fzPBt6yMIU1yZaz7BO1jiBUq8=,tag:nhCWGLnCwKW/vyOD6dZHbA==,type:str]
 mailserver-vaultwarden: ENC[AES256_GCM,data:/rvxrhm3TZza3dFuz2aFp06W7iDG/whjxreg3+kJuAufIYNS46Hl6pLoZDbKelXFkn+1Ugvykef9DBEL3Q==,iv:ny/H1R7cHKmp3r+4YtFbZbC+1MACn3KVX5ROd80iYKM=,tag:4h7FrCFTRRD7sePfOAzhqw==,type:str]
+mailserver-noreply: ENC[AES256_GCM,data:NgOZ1JI6cXRQG2AH2Rx3zXai/MYtZvrJ7DpwknTTCuPi7bYBwAiRyOBynUltnItjZb/MDmM5tJ6cX30P2g==,iv:F/vkLAbtNVpa2/1o6cz05OFcQnsBFZuZZ8rG4E7gS70=,tag:CX2/7SmiH6qu5i/Oi/hL2A==,type:str]
+mailserver-spam: ENC[AES256_GCM,data:QJKHyzY/GAwsc0sJfoCR7IEJAoakJ5KS94qIbi4fIoH4CqhJ+qjaLLvuI39Mu2Hrp2gCSvfBJ3oQlN5brQ==,iv:Acashw2STfzbzGBaXrFtHwlEc/AqSkBHKYXwVHOKC6Q=,tag:2Z6UXbe4fTxZq095vbKAZA==,type:str]
 mailserver-database: ENC[AES256_GCM,data:HR+U0nieGQjWX9iws2awtw==,iv:+Vc+3xGrZibBXZSBx6REW3u//0tzUi6a8ODNJhngS5w=,tag:oKyi1s7FzLYzEieGzuLR5Q==,type:str]
 rspamd-web: ENC[AES256_GCM,data:jgwF2Pix4QpWGJBKNibPXfh1yfs+5z2oq9XQ1B/C3xZ4BYAQ2aBIZcNoJj1U,iv:8mPIjqC47fX+8Zi5946aLMkGIeTbhVMHSpp7bTx58AA=,tag:e5hYLkgTULd1hJ/XTDwmSg==,type:str]
 vaultwarden-env: ENC[AES256_GCM,data:RZltkcbeTObbSVPIx4x2yP/e6o/WvAuChfmLki8gkX0L5NXYbm3hBOfA1cKMN34git1xNfPyckHm1zV4ZumTfeWtyBOvUZd1TqZxCObh0v67jZUH2pXWybot+LAd+MWf4dYphxiq8/yvvmOwH5WG82HAudOKcnkQ0qDjv47gEbD87IRgeFod3su2h8zd60iMIHTb6G+ErV06XpWizEsnDxWZzpl3k1WO2V30coVY48D/Sh3FQSrEceL4xMBZzRmVhu8Xh3cOqcSejEjS/PkNUYf+7IwDMn5hFXC6/yzgHHva4w==,iv:w6u+8ME93rGbXirMIS/hSSDwiRBKFbSEcLFQjxTHGak=,tag:rDY68+rvgzvVC29Ko+69bw==,type:str]
@@ -39,8 +41,8 @@ sops:
             cDRpZkkxZWhiVmN1Y1FSRm5seVpmbnMKl7CHdNdXOr67tCjYp+jhUSYImndyvhQP
             heUpcdBCJADlE9oG6lDr4ngwdHFqVrN757uMqZWEbT80hzZUXVRArw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-10-19T22:22:34Z"
-    mac: ENC[AES256_GCM,data:CydoWQSUTW1UxeP1o5jYkjBB+fQpOrWPcObkeVhfDDIz3ZORj8bT/JU6wcudh58DgDnRUme+F/6c59wTA8Iamtl7fKwFV/W3z2AzqL6VfA6XROGUXfrOTMq+xk/D4HX6X1Dge86dzsm6Y/N/R17GfRFTPIZnOAkcb1rW+qjftjs=,iv:kT+5MEIF5YyyXmHlSZSEUd5UCB5SIBm2YJaGgeT8uBA=,tag:E+m7MO/GOUhjoJWI+C98JA==,type:str]
+    lastmodified: "2023-10-23T18:12:50Z"
+    mac: ENC[AES256_GCM,data:ShhL2973BN7dmdY+2s1NHqlgZ1PR8T82spWH2ZgYz7mKWZhfNFBiuGvBoMHAEYNUaieanI6SataTmEIq5Ud74RqskWOaKm92DVl7nfC31jqgtsshv2aj36+AREcmrKQ/dZcEVO8rnad1cTX2wyYDrkTHzFuU2ler/O+Az3y8CVU=,iv:c0eaetlOBsHe6/FKg0xGaPcENuf50pWMBbRUVVPHNKc=,tag:AJ8kyr/StFEfnX/UhAQz6A==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/modules/common/types/server/services/mailserver/default.nix b/modules/common/types/server/services/mailserver/default.nix
index 5448ee5d0..ee72059c9 100644
--- a/modules/common/types/server/services/mailserver/default.nix
+++ b/modules/common/types/server/services/mailserver/default.nix
@@ -133,6 +133,16 @@ in {
           aliases = ["grafana" "monitor" "monitor@${domain}"];
           hashedPasswordFile = config.sops.secrets.mailserver-grafana.path;
         };
+
+        "noreply@${domain}" = {
+          aliases = ["noreply"];
+          hashedPasswordFile = config.sops.secrets.mailserver-noreply.path;
+        };
+
+        "spam@${domain}" = {
+          aliases = ["spam" "shush" "shush@${domain}" "stfu" "stfu@${domain}"];
+          hashedPasswordFile = config.sops.secrets.mailserver-spam.path;
+        };
       };
 
       mailboxes = {