From 26022cf3dd36b037b0f8a55d651e5080bf077e4f Mon Sep 17 00:00:00 2001 From: Fabian Hauser Date: Tue, 25 Feb 2025 22:17:58 +0200 Subject: [PATCH] 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 ];