From 16b99018c929e52ded0684e2aa184a0132e7dbb0 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@hoyer.xyz>
Date: Fri, 5 Jul 2024 09:54:35 +0200
Subject: [PATCH] feat: Update certificate scheme in mailserver

This commit updates the certificate scheme configuration on the mailserver. The `certificateScheme` and `acmeCertificateName` have been added, and an unnecessary certificate reference in the `acme.nix` file has been deleted.
---
 systems/x86_64-linux/mx/acme.nix       | 2 --
 systems/x86_64-linux/mx/mailserver.nix | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/systems/x86_64-linux/mx/acme.nix b/systems/x86_64-linux/mx/acme.nix
index cc9ce81..8dc044e 100644
--- a/systems/x86_64-linux/mx/acme.nix
+++ b/systems/x86_64-linux/mx/acme.nix
@@ -12,8 +12,6 @@
       credentialsFile = config.sops.secrets.internetbs.path;
     };
     certs = {
-      "mx.surfsite.org" = { };
-
       "surfsite.org" = {
         extraDomainNames = [
           "*.surfsite.org"
diff --git a/systems/x86_64-linux/mx/mailserver.nix b/systems/x86_64-linux/mx/mailserver.nix
index 12fef09..7c00dc5 100644
--- a/systems/x86_64-linux/mx/mailserver.nix
+++ b/systems/x86_64-linux/mx/mailserver.nix
@@ -5,6 +5,8 @@
     enable = true;
     fqdn = "mx.surfsite.org";
     sendingFqdn = "mx.surfsite.org";
+    certificateScheme = "acme";
+    acmeCertificateName = "surfsite.org";
     domains = [
       "harald-hoyer.de"
       "hartwin-hoyer.de"
@@ -206,8 +208,7 @@
         ];
       };
     };
-    certificateScheme = "acme";
-  };
+   };
 
   services.roundcube = {
     enable = true;