mailserver builds

flake.lock

@@ -467,16 +467,16 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1720535198,
-        "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=",
+        "lastModified": 1735141468,
+        "narHash": "sha256-VIAjBr1qGcEbmhLwQJD6TABppPMggzOvqFsqkDoMsAY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5",
+        "rev": "4005c3ff7505313cbc21081776ad0ce5dfd7a3ce",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -4,7 +4,7 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs.follows = "nixos-cosmic/nixpkgs";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -143,7 +143,7 @@
           modules = [
             ./systems/dalinar/configuration.nix
             # nix-bitcoin.nixosModules.default
-            # simple-nixos-mailserver.nixosModules.default
+            simple-nixos-mailserver.nixosModule
           ];
         };
         kohlin = nixpkgs-stable.lib.nixosSystem {

modules/mailserver.nix

@@ -6,16 +6,16 @@ let
 in
 with lib;
 {
-  services.caddy = {
-    virtualHosts = {
-      "mail.cochrun.xyz".extraConfig = ''
-        tls internal {
-          key_type rsa2048
-        } 
-        respond "Hello DMS"
-      '' ;
-    };   
-  };
+  # services.caddy = {
+  #   virtualHosts = {
+  #     "mail.cochrun.xyz".extraConfig = ''
+  #       tls internal {
+  #         key_type rsa2048
+  #       } 
+  #       respond "Hello DMS"
+  #     '' ;
+  #   };   
+  # };
   mailserver = {
     enable = true;
     fqdn = fqdn;
@@ -24,7 +24,7 @@ with lib;
     mailDirectory = "/home/chris/mailserver/docker-data/mail-data";
     mailboxes = {
       Archive = {
-        auto = "subsribe";
+        auto = "subscribe";
         specialUse = "Archive";
       };
       Drafts = {
@@ -47,8 +47,8 @@ with lib;
     useFsLayout = true;
     hierarchySeparator = "/";
     certificateScheme = "acme";
-    certificateFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/${fqdn}/${fqdn}.crt";
-    keyFile = "/var/lib/caddy/.local/share/caddy/certificates/acme-v02.api.letsencrypt.org-directory/${fqdn}/${fqdn}.key";
+    certificateFile = "/var/lib/acme/${fqdn}/fullchain.pem";
+    keyFile = "/var/lib/acme/${fqdn}/key.pem";
     loginAccounts = {
       "chris@cochrun.xyz" = {
         hashedPasswordFile = "/home/chris/mailp";
@@ -63,4 +63,13 @@ with lib;
       };
     };
   };
+
+  security.acme = {
+    acceptTerms = true;
+    defaults.email = "chris@cochrun.xyz";
+    certs.${fqdn} = {
+      webroot = "/var/lib/acme/acme-challenge/";
+      # dnsProvider = "namecheap";
+    };
+  };
 }

modules/servers.nix

@@ -3,7 +3,7 @@
 with lib;
 {
   nix = {
-    package = pkgs.nixFlakes; 
+    package = pkgs.nixVersions.stable; 
   };
 }