fi/nix-infra
1
2
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update NixOS 25.11 to 26.05

Browse source
This commit is contained in:
fi 2026-07-03 19:33:12 +02:00
commit d619a245db
Signed by: fi
SSH key fingerprint: SHA256:dgX1HRsK+8F1OzYvKfv1VLhMJac/Iv/rsjixuV94+dA
7 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

21
config/hosts/mail-1/simple-nixos-mailserver.nix
View file

@ -1,4 +1,4 @@
{ simple-nixos-mailserver, ... }:
{ simple-nixos-mailserver, config, ... }:
{
imports = [
simple-nixos-mailserver.nixosModule {
@ -11,9 +11,9 @@
enableImapSsl = true;
enableSubmission = false;
enableSubmissionSsl = true;
lmtpSaveToDetailMailbox = "no";
lmtpSaveToDetailMailbox = false;
domains = [ "grzb.de" "vs.grzb.de" "wg.grzb.de" "nekover.se" ];
loginAccounts = {
accounts = {
"fiona@grzb.de" = {
hashedPasswordFile = "/run/secrets/mail-fiona-grzb-de";
aliases = [ "@grzb.de" ];
@ -68,7 +68,8 @@
aliases = [ "nyareply@nekover.se" ];
};
};
certificateScheme = "acme-nginx";
# Reference the existing ACME configuration created by nginx
x509.useACMEHost = config.mailserver.fqdn;
};
}
];
@ -80,6 +81,18 @@
};
};
# https://letsencrypt.org/repository/#let-s-encrypt-subscriber-agreement
security.acme.acceptTerms = true;
# Allow incoming HTTP connections
networking.firewall.allowedTCPPorts = [ 80 ];
# Enable ACME HTTP-01 challenge with nginx
services.nginx = {
enable = true;
virtualHosts.${config.mailserver.fqdn}.enableACME = true;
};
sops.secrets."mail-fiona-grzb-de" = {
mode = "0440";
owner = "root";