From c84feaecff055c517d8587566350c9e67b48069d Mon Sep 17 00:00:00 2001
From: ibizaman <ibizapeanut@gmail.com>
Date: Sat, 31 Aug 2024 11:19:15 +0200
Subject: [PATCH] respect stateVersion in vaultwarden
---
CHANGELOG.md | 1 -
modules/services/vaultwarden.nix | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98f0fa7..9e187a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,6 @@
- `shb.authelia.oidcClients.id` -> `shb.authelia.oidcClients.client_id`
- `shb.authelia.oidcClients.description` -> `shb.authelia.oidcClients.client_name`
- `shb.authelia.oidcClients.secret` -> `shb.authelia.oidcClients.client_secret`
-- Vaultwarden data folder changed to `/var/lib/vaultwarden`.
## User Facing Backwards Compatible Changes
diff --git a/modules/services/vaultwarden.nix b/modules/services/vaultwarden.nix
index 391f36b..32d3573 100644
--- a/modules/services/vaultwarden.nix
+++ b/modules/services/vaultwarden.nix
@@ -8,7 +8,7 @@ let
fqdn = "${cfg.subdomain}.${cfg.domain}";
- dataFolder = "/var/lib/vaultwarden";
+ dataFolder = if lib.versionOlder (config.system.stateVersion or "24.11") "24.11" then "/var/lib/bitwarden_rs" else "/var/lib/vaultwarden";
in
{
options.shb.vaultwarden = {