summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Guerini Rocco <rnhmjoj@users.noreply.github.com>2022-02-01 09:50:27 +0100
committerGitHub <noreply@github.com>2022-02-01 09:50:27 +0100
commit16694a4f0d2f146bda3f1ad6ce0158ab8dc98654 (patch)
treea3d62f27158d32799ab0f2804631de89d370690b
parentMerge pull request #157578 from aanderse/sqlsrv (diff)
parentnixos/vaultwarden: fix alias after #152372 (diff)
downloadnixpkgs-16694a4f0d2f146bda3f1ad6ce0158ab8dc98654.tar.gz
Merge pull request #157652 from K900/fix-152372-fallout
Fix a few things after #152372
-rw-r--r--nixos/modules/services/networking/murmur.nix2
-rw-r--r--nixos/modules/services/security/vaultwarden/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index bbbe1e181bba..992678c43ebe 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -294,7 +294,7 @@ in
systemd.services.murmur = {
description = "Murmur Chat Service";
wantedBy = [ "multi-user.target" ];
- after = [ "network-online.target "];
+ after = [ "network-online.target" ];
preStart = ''
${pkgs.envsubst}/bin/envsubst \
-o /run/murmur/murmurd.ini \
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index 71088fc4dcd8..fd459f70ccde 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -131,7 +131,7 @@ in {
users.groups.vaultwarden = { };
systemd.services.vaultwarden = {
- aliases = [ "bitwarden_rs" ];
+ aliases = [ "bitwarden_rs.service" ];
after = [ "network.target" ];
path = with pkgs; [ openssl ];
serviceConfig = {