mailserver builds

This commit is contained in:
Chris Cochrun 2024-12-26 22:26:03 -06:00
parent d3a1471a5a
commit be20822334
4 changed files with 29 additions and 20 deletions

View file

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

View file

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

View file

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

View file

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