From 4d70fd2bf861be382fbbe6114881ac0ab3cd7b04 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Feb 2025 20:10:09 +0100 Subject: [PATCH 1/3] Lock file maintenance --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 121c503..2fa4660 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-nixos-stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": { From 26022cf3dd36b037b0f8a55d651e5080bf077e4f Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Tue, 25 Feb 2025 22:17:58 +0200 Subject: [PATCH 2/3] Switch mstmp password reader to coreutils for services --- nixos-modules/outgoing-server-mail/default.nix | 2 +- nixos-modules/vault/default.nix | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos-modules/outgoing-server-mail/default.nix b/nixos-modules/outgoing-server-mail/default.nix index 2f04382..8718fe4 100644 --- a/nixos-modules/outgoing-server-mail/default.nix +++ b/nixos-modules/outgoing-server-mail/default.nix @@ -40,7 +40,7 @@ with lib; host = "mail.cyon.ch"; user = "system@qo.is"; from = "no-reply@qo.is"; - passwordeval = "${pkgs.busybox}/bin/cat ${config.sops.secrets."msmtp/password".path}"; + passwordeval = "${pkgs.coreutils}/bin/cat ${config.sops.secrets."msmtp/password".path}"; }; }; }; diff --git a/nixos-modules/vault/default.nix b/nixos-modules/vault/default.nix index 36332af..0171b45 100644 --- a/nixos-modules/vault/default.nix +++ b/nixos-modules/vault/default.nix @@ -34,6 +34,8 @@ with lib; ROCKET_PORT = 8222; USE_SENDMAIL = true; + SENDMAIL_COMMAND = "${pkgs.msmtp}/bin/sendmail"; + SMTP_FROM = "vault@qo.is"; SMTP_FROM_NAME = cfg.domain; @@ -68,7 +70,6 @@ with lib; # See https://search.nixos.org/options?channel=unstable&show=services.vaultwarden.environmentFile sops.secrets."vaultwarden/environment-file".restartUnits = [ "vaultwarden.service" ]; - systemd.services.vaultwarden.path = [ pkgs.msmtp ]; users.users.vaultwarden.extraGroups = [ "postdrop" ]; networking.hosts."127.0.0.1" = [ cfg.domain ]; From 17d2b1f3886da5ff66691c885afddd6f23ecc8c4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Feb 2025 21:40:08 +0100 Subject: [PATCH 3/3] Lock file maintenance --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 121c503..2fa4660 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs-nixos-stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -90,11 +90,11 @@ }, "nixpkgs-nixos-unstable": { "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1737411508, - "narHash": "sha256-j9IdflJwRtqo9WpM0OfAZml47eBblUHGNQTe62OUqTw=", + "lastModified": 1739262228, + "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "015d461c16678fc02a2f405eb453abb509d4e1d4", + "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", "type": "github" }, "original": {