updates

modules/nixos/services/mail/default.nix

@@ -33,7 +33,7 @@ in {
       gitlab-email-pw-hashed.file = ./sec/gitlab-email-pw-hashed.age;
     };
 
-    mailserver = {
+    mailserver = rec {
       enable = true;
       fqdn = "mail.zoeys.email";
       domains = ["zoeys.email" "zoeys.cloud" "zoeys.computer" "zackmyers.io" "zacharymyers.com" "pictureofcat.com"];
@@ -64,27 +64,23 @@ in {
         };
       };
 
-      certificateScheme = "acme-nginx";
+      enableManageSieve = true;
+
+      dmarcReporting.enable = true;
+
+      x509.useACMEHost = fqdn;
       virusScanning = true;
       stateVersion = 3;
     };
 
-    # services.nginx = {
-    #   virtualHosts = {
-    #     "cal.zoeys.cloud" = {
-    #       forceSSL = true;
-    #       enableACME = true;
-    #       locations."/" = {
-    #         proxyPass = "http://localhost:5232/";
-    #         extraConfig = ''
-    #           proxy_set_header  X-Script-Name /;
-    #           proxy_set_header  X-Forwarded-For $proxy_add_x_forwarded_for;
-    #           proxy_pass_header Authorization;
-    #         '';
-    #       };
-    #     };
-    #   };
-    # };
+    services.nginx = {
+      virtualHosts = {
+        "${config.mailserver.fqdn}" = {
+          forceSSL = true;
+          enableACME = true;
+        };
+      };
+    };
 
     services.roundcube = {
       enable = true;