From 7c1869afb012a9c18918b36ec91e26a248a53bc5 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 10 Aug 2025 19:04:47 +0200 Subject: ... --- _sources/generated.json | 12 ++++----- _sources/generated.nix | 12 ++++----- flake.lock | 60 +++++++++++++++++++++---------------------- hosts/sif/email/default.nix | 17 ++++++------ hosts/surtr/email/default.nix | 21 ++++++++------- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 802099d7..670ba5c6 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -270,11 +270,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-8kd17ChqLuVH5/OdPc2rVDKEDWHl9ZWLh8k+EBrCGH8=", + "sha256": "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.87/netboot.xyz.efi" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.efi" }, - "version": "2.0.87" + "version": "2.0.88" }, "netbootxyz-lkrn": { "cargoLocks": null, @@ -285,11 +285,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-/qY3NdRC0SghQ4kamrkm9EFumrKlirqDCJ+XY+jHWLA=", + "sha256": "sha256-igy3O30noS25dU7ZnHuKrWqLLkjjd/L46IdCTd038dI=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.87/netboot.xyz.lkrn" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.lkrn" }, - "version": "2.0.87" + "version": "2.0.88" }, "postfix-mta-sts-resolver": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 75373a48..b856af2c 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -164,18 +164,18 @@ }; netbootxyz-efi = { pname = "netbootxyz-efi"; - version = "2.0.87"; + version = "2.0.88"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.87/netboot.xyz.efi"; - sha256 = "sha256-8kd17ChqLuVH5/OdPc2rVDKEDWHl9ZWLh8k+EBrCGH8="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.efi"; + sha256 = "sha256-ipbZJ0mPCuwzb/TDtXXUBTuWOcSsKGAJ1GEGIgB2G7E="; }; }; netbootxyz-lkrn = { pname = "netbootxyz-lkrn"; - version = "2.0.87"; + version = "2.0.88"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.87/netboot.xyz.lkrn"; - sha256 = "sha256-/qY3NdRC0SghQ4kamrkm9EFumrKlirqDCJ+XY+jHWLA="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/2.0.88/netboot.xyz.lkrn"; + sha256 = "sha256-igy3O30noS25dU7ZnHuKrWqLLkjjd/L46IdCTd038dI="; }; }; postfix-mta-sts-resolver = { diff --git a/flake.lock b/flake.lock index 9a1470a6..14568259 100644 --- a/flake.lock +++ b/flake.lock @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753514742, - "narHash": "sha256-OP7hZTjnOLP3X6cWldPLcxQ4vvDYid6SlOf1mw+XRCg=", + "lastModified": 1754797984, + "narHash": "sha256-t2WFkdB2qUyZt5rdqmJ340kqhvQWWOCJBJIc1nQ/Hg4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "af1af659e690b3e535d94c54a64700767bfc9544", + "rev": "647a310f1eaa59abec8aa215ff69d8979195425e", "type": "github" }, "original": { @@ -541,11 +541,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1754742008, + "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39", "type": "github" }, "original": { @@ -582,11 +582,11 @@ ] }, "locked": { - "lastModified": 1752985182, - "narHash": "sha256-sX8Neff8lp3TCHai6QmgLr5AD8MdsQQX3b52C1DVXR8=", + "lastModified": 1754800038, + "narHash": "sha256-UbLO8/0pVBXLJuyRizYOJigtzQAj8Z2bTnbKSec/wN0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "fafdcb505ba605157ff7a7eeea452bc6d6cbc23c", + "rev": "b65f8d80656f9fcbd1fecc4b7f0730f468333142", "type": "github" }, "original": { @@ -639,11 +639,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -780,11 +780,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -828,11 +828,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1753429684, - "narHash": "sha256-9h7+4/53cSfQ/uA3pSvCaBepmZaz/dLlLVJnbQ+SJjk=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fd36ee82c0275fb545775cc5e4d30542899511d", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -1093,11 +1093,11 @@ ] }, "locked": { - "lastModified": 1753063596, - "narHash": "sha256-el1vFxDk6DR2hKGYnMfQHR7+K4aMiJDKQRMP3gdh+ZI=", + "lastModified": 1754287816, + "narHash": "sha256-kDt0HB89oWTlTQMnTwDxx3BlRHK1AdAJ1kMcVYGuccs=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "cac90713492f23be5f1072bae88406890b9c68f6", + "rev": "efe944d0902f406c28b4e8662312292a37e4de87", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ ] }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -1240,11 +1240,11 @@ ] }, "locked": { - "lastModified": 1753400079, - "narHash": "sha256-VC76rfCgtaKPopaLOyAEZ80bpOTQDr7wEZRUCMjoacE=", + "lastModified": 1754719699, + "narHash": "sha256-Ek6WILkhVMDWm9j0L23gxHhDt62z1+A68D+pPt0ghao=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "350ae196e0e414c03db118d385eabaf50e2a0a53", + "rev": "38ead6a16ba1be029dd40fe17fc064d6934847d2", "type": "github" }, "original": { @@ -1297,11 +1297,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", + "lastModified": 1754533920, + "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", + "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", "type": "github" }, "original": { diff --git a/hosts/sif/email/default.nix b/hosts/sif/email/default.nix index 4eda236e..bebf7980 100644 --- a/hosts/sif/email/default.nix +++ b/hosts/sif/email/default.nix @@ -5,11 +5,12 @@ enableSmtp = false; enableSubmission = false; setSendmail = true; - networksStyle = "host"; - hostname = "sif.midgard.yggdrasil"; - destination = []; - recipientDelimiter = "+"; - config = { + # networksStyle = "host"; + settings.main = { + recpipient_delimiter = "+"; + mydestination = []; + myhostname = "sif.midgard.yggdrasil"; + mydomain = "yggdrasil.li"; local_transport = "error:5.1.1 No local delivery"; @@ -19,7 +20,7 @@ inet_interfaces = "loopback-only"; - message_size_limit = "0"; + message_size_limit = 0; authorized_submit_users = "inline:{ gkleen= }"; authorized_flush_users = "inline:{ gkleen= }"; @@ -41,7 +42,7 @@ /^uni2work(-[^@]*)?@ifi\.lmu\.de$/ uni2work@ifi.lmu.de /@ifi\.lmu\.de$/ gregor.kleen@ifi.lmu.de ''}''; - relayhost = "[surtr.yggdrasil.li]:465"; + relayhost = ["[surtr.yggdrasil.li]:465"]; default_transport = "relay"; smtp_sasl_auth_enable = true; @@ -56,7 +57,7 @@ smtp_tls_loglevel = "1"; smtp_dns_support_level = "dnssec"; }; - masterConfig = { + settings.master = { submission = { type = "inet"; private = false; diff --git a/hosts/surtr/email/default.nix b/hosts/surtr/email/default.nix index de8a6730..a3e06ca6 100644 --- a/hosts/surtr/email/default.nix +++ b/hosts/surtr/email/default.nix @@ -124,13 +124,14 @@ in { services.postfix = { enable = true; enableSmtp = false; - hostname = "surtr.yggdrasil.li"; - recipientDelimiter = ""; setSendmail = true; postmasterAlias = ""; rootAlias = ""; extraAliases = ""; - destination = []; - networks = []; - config = { + settings.main = { + recpipient_delimiter = ""; + mydestination = []; + mynetworks = []; + myhostname = "surtr.yggdrasil.li"; + smtpd_tls_security_level = "may"; smtpd_tls_chain_files = [ @@ -177,10 +178,8 @@ in { local_recipient_maps = ""; - # 10 GiB - message_size_limit = "10737418240"; - # 10 GiB - mailbox_size_limit = "10737418240"; + message_size_limit = 10 * 1024 * 1024 * 1024; + mailbox_size_limit = 10 * 1024 * 1024 * 1024; smtpd_delay_reject = true; smtpd_helo_required = true; @@ -280,7 +279,7 @@ in { query = SELECT value FROM recipient_bcc_maps WHERE key = '%s' ''}''; }; - masterConfig = { + settings.master = { "465" = { type = "inet"; private = false; @@ -660,7 +659,7 @@ in { quota_status_success = DUNNO quota_status_nouser = DUNNO quota_grace = 10%% - quota_max_mail_size = ${config.services.postfix.config.message_size_limit} + quota_max_mail_size = ${toString config.services.postfix.settings.main.message_size_limit} quota_vsizes = yes } -- cgit v1.2.3