From 35f32fe673487b22ff45c5a33f1bc111f6ec2d91 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Thu, 22 May 2025 22:30:03 +0200
Subject: [PATCH 1/2] acme: remove invalid config

---
 modules/services/acme/module.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/modules/services/acme/module.nix b/modules/services/acme/module.nix
index 68473b8..078b405 100644
--- a/modules/services/acme/module.nix
+++ b/modules/services/acme/module.nix
@@ -30,11 +30,4 @@ in {
       # "mail.charlieroot.dev" = mkAcmeCert "mail.charlieroot.dev";
     };
   };
-
-  services.nginx.appendConfig = ''
-    location /.well-known/acme-challenge/ {
-      rewrite /.well-known/acme-challenge/(.*) /$1 break;
-      root /var/lib/acme/.well-known/acme-challenge;
-    }
-  '';
 }

From 4e4795cc88c93375d34d22bf1114cd1108801063 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Thu, 22 May 2025 22:42:36 +0200
Subject: [PATCH 2/2] stalwart: fix localhost ips, fix postgresql

---
 modules/services/stalwart/module.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/modules/services/stalwart/module.nix b/modules/services/stalwart/module.nix
index 5efc214..903efec 100644
--- a/modules/services/stalwart/module.nix
+++ b/modules/services/stalwart/module.nix
@@ -55,17 +55,17 @@ in {
             # and is used by mail clients to send email to mail servers.
 
             submissions = {
-              bind = ["localhost::465" "[::]:465"];
+              bind = ["localhost:465" "[::]:465"];
               protocol = "smtp";
               tls.implicit = true;
             };
             imaps = {
-              bind = ["localhost::993" "[::]:993"];
+              bind = ["localhost:993" "[::]:993"];
               protocol = "imap";
               tls.implicit = true;
             };
             jmap = {
-              bind = ["localhost::8080" "[::]:8080"];
+              bind = ["localhost:8080" "[::]:8080"];
               url = "https://mail.${domain}";
               protocol = "jmap";
               tls.implicit = true;
@@ -91,7 +91,7 @@ in {
           };
         };
         store = {
-          postgresql = {
+          "postgresql" = {
             # Specifies the database type, set to "postgresql" for PostgreSQL.
             type = "postgresql";
 
@@ -102,17 +102,10 @@ in {
             port = "5432";
 
             # Name of the database to connect to.
-            # TODO: add this to PostgreSQL.
-            name = "stalwart";
+            database = "stalwart";
 
             # The username used for authentication with the PostgreSQL server.
-            # TODO: add this to PostgreSQL.
-            username = "stalwart";
-
-            # Compression algorithm to use.
-            compression = "lz4";
-            # Clean up every day at 5:30am local time.
-            purge.frequency = "30 5 *";
+            user = "stalwart";
 
             # Enable TLS
             tls.enable = true;