preisi/mailnix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake.nix: Update NixOS release to 25.11

Browse source
This commit is contained in:
Thomas Preisner 2025-12-08 22:34:53 +01:00
parent 95d920ae67
commit 54f84355ee
8 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -96,16 +96,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1748162331, "lastModified": 1764983851,
"narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

2
flake.nix
View file

@ -2,7 +2,7 @@
description = "An opinionated Nixos Mailsystem"; description = "An opinionated Nixos Mailsystem";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";

2
mailsystem/dovecot.nix
View file

@ -261,7 +261,7 @@ in {
security.dhparams.params.dovecot2.bits = cfg.dovecot.dhparamSize; security.dhparams.params.dovecot2.bits = cfg.dovecot.dhparamSize;
systemd.services.dovecot2 = { systemd.services.dovecot = {
preStart = '' preStart = ''
${genAuthDbsScript} ${genAuthDbsScript}
${genMaildirScript} ${genMaildirScript}

14
mailsystem/postfix.nix
View file

@ -63,9 +63,6 @@ in {
hostname = "${cfg.reverseFqdn}"; hostname = "${cfg.reverseFqdn}";
networksStyle = "host"; networksStyle = "host";
sslCert = sslCertPath;
sslKey = sslKeyPath;
enableSubmissions = true; enableSubmissions = true;
mapFiles."virtual_aliases" = aliases_file; mapFiles."virtual_aliases" = aliases_file;
@ -85,12 +82,17 @@ in {
cleanup_service_name = "submission-header-cleanup"; cleanup_service_name = "submission-header-cleanup";
}; };
config = { settings.main = {
mydestination = ""; mydestination = "";
recipient_delimiter = "+"; recipient_delimiter = "+";
smtpd_banner = "${cfg.fqdn} ESMTP NO UCE"; smtpd_banner = "${cfg.fqdn} ESMTP NO UCE";
disable_vrfy_command = true; disable_vrfy_command = true;
message_size_limit = toString cfg.messageSizeLimit; message_size_limit = cfg.messageSizeLimit;
smtpd_tls_chain_files = [
sslKeyPath
sslCertPath
];
virtual_uid_maps = "static:${toString cfg.vmailUID}"; virtual_uid_maps = "static:${toString cfg.vmailUID}";
virtual_gid_maps = "static:${toString cfg.vmailUID}"; virtual_gid_maps = "static:${toString cfg.vmailUID}";
@ -165,7 +167,7 @@ in {
smtpd_forbid_bare_newline_exclusions = "$mynetworks"; smtpd_forbid_bare_newline_exclusions = "$mynetworks";
}; };
masterConfig = { settings.master = {
"lmtp" = { "lmtp" = {
# Add headers when delivering, see http://www.postfix.org/smtp.8.html # Add headers when delivering, see http://www.postfix.org/smtp.8.html
# D => Delivered-To, O => X-Original-To, R => Return-Path # D => Delivered-To, O => X-Original-To, R => Return-Path

2
tests/aliases.nix
View file

@ -32,7 +32,7 @@ with (import ./common/lib.nix {inherit pkgs;}); let
}; };
}; };
in in
pkgs.nixosTest { pkgs.testers.nixosTest {
name = "aliases"; name = "aliases";
nodes = { nodes = {
server = {pkgs, ...}: { server = {pkgs, ...}: {

2
tests/basic.nix
View file

@ -16,7 +16,7 @@ with (import ./common/lib.nix {inherit pkgs;}); let
}; };
}; };
in in
pkgs.nixosTest { pkgs.testers.nixosTest {
name = "basic"; name = "basic";
nodes = { nodes = {
server = {pkgs, ...}: { server = {pkgs, ...}: {

2
tests/internal.nix
View file

@ -1,5 +1,5 @@
{pkgs, ...}: {pkgs, ...}:
pkgs.nixosTest { pkgs.testers.nixosTest {
name = "internal"; name = "internal";
nodes.machine = {...}: { nodes.machine = {...}: {
imports = [./common/server.nix]; imports = [./common/server.nix];

10
tests/rspamd.nix
View file

@ -30,7 +30,7 @@ with (import ./common/lib.nix {inherit pkgs;}); let
domains domains
); );
in in
pkgs.nixosTest { pkgs.testers.nixosTest {
name = "rspamd"; name = "rspamd";
nodes = { nodes = {
server = {pkgs, ...}: { server = {pkgs, ...}: {
@ -151,12 +151,12 @@ in
server.wait_until_fails('${pendingPostqueue}') server.wait_until_fails('${pendingPostqueue}')
client.succeed("${test-mark-spam "normal2"} >&2") client.succeed("${test-mark-spam "normal2"} >&2")
server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-spam.sh >&2") server.wait_until_succeeds("journalctl -u dovecot | grep -i learn-spam.sh >&2")
server.fail("journalctl -u dovecot2 | grep -i learn-spam.sh | grep -i error >&2") server.fail("journalctl -u dovecot | grep -i learn-spam.sh | grep -i error >&2")
client.succeed("${test-mark-ham "normal2"} >&2") client.succeed("${test-mark-ham "normal2"} >&2")
server.wait_until_succeeds("journalctl -u dovecot2 | grep -i learn-ham.sh >&2") server.wait_until_succeeds("journalctl -u dovecot | grep -i learn-ham.sh >&2")
server.fail("journalctl -u dovecot2 | grep -i learn-ham.sh | grep -i error >&2") server.fail("journalctl -u dovecot | grep -i learn-ham.sh | grep -i error >&2")
with subtest("dkim signing"): with subtest("dkim signing"):
client.succeed("${sendMail "normal2" "" accounts."normal".address '' client.succeed("${sendMail "normal2" "" accounts."normal".address ''