AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update vaultwarden config

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-04-25 17:20:58 +03:00
parent 42ebbbba6c
commit 26219a7381
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@ -107,6 +107,7 @@
"bitwarden-pr224092.patch" "bitwarden-pr224092.patch"
"ivpn.patch" "ivpn.patch"
"ivpn-ui.patch" "ivpn-ui.patch"
"vaultwarden.patch"
]; ];
channelsConfig = { allowUnfree = true; }; channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs; channels.unstable.input = nixpkgs;

14
patches/vaultwarden.patch
View File

@ -7,15 +7,15 @@ index aaa3f5507f7..d6a72f74370 100644
${nameToEnvVar name} = if isBool value then boolToString value else toString value; ${nameToEnvVar name} = if isBool value then boolToString value else toString value;
}) cfg.config; }) cfg.config;
- in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { - in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
+ in { DATA_FOLDER = cfg.stateDir; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") { + in { DATA_FOLDER = cfg.dataDir; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault"; WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault";
} // configEnv; } // configEnv;
@@ -57,6 +57,16 @@ in { @@ -57,6 +57,16 @@ in {
''; '';
}; };
+ stateDir = mkOption { + dataDir = mkOption {
+ type = str; + type = str;
+ default = "/var/lib/bitwarden_rs"; + default = "/var/lib/bitwarden_rs";
+ description = '' + description = ''
@ -48,7 +48,7 @@ index aaa3f5507f7..d6a72f74370 100644
- Restart = "always"; - Restart = "always";
- }; - };
+ serviceConfig = mkMerge [ + serviceConfig = mkMerge [
+ (mkIf (cfg.stateDir == "/var/lib/bitwarden_rs") { + (mkIf (cfg.dataDir == "/var/lib/bitwarden_rs") {
+ StateDirectory = "bitwarden_rs"; + StateDirectory = "bitwarden_rs";
+ StateDirectoryMode = "0700"; + StateDirectoryMode = "0700";
+ }) + })
@ -68,13 +68,13 @@ index aaa3f5507f7..d6a72f74370 100644
+ ]; + ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
}; };
@@ -206,7 +220,7 @@ in { @@ -206,7 +220,7 @@ in {
aliases = [ "backup-bitwarden_rs.service" ]; aliases = [ "backup-bitwarden_rs.service" ];
description = "Backup vaultwarden"; description = "Backup vaultwarden";
environment = { environment = {
- DATA_FOLDER = "/var/lib/bitwarden_rs"; - DATA_FOLDER = "/var/lib/bitwarden_rs";
+ DATA_FOLDER = cfg.stateDir; + DATA_FOLDER = cfg.dataDir;
BACKUP_FOLDER = cfg.backupDir; BACKUP_FOLDER = cfg.backupDir;
}; };
path = with pkgs; [ sqlite ]; path = with pkgs; [ sqlite ];

6
profiles/servers/vaultwarden.nix
View File

@ -12,7 +12,8 @@ in {
domain = "https://vw.ataraxiadev.com"; domain = "https://vw.ataraxiadev.com";
extendedLogging = true; extendedLogging = true;
invitationsAllowed = false; invitationsAllowed = false;
logFile = "/var/log/vaultwarden.log"; useSyslog = true;
# logFile = "/var/log/vaultwarden.log";
logLevel = "warn"; logLevel = "warn";
rocketAddress = "127.0.0.1"; rocketAddress = "127.0.0.1";
rocketPort = 8812; rocketPort = 8812;
@ -31,6 +32,7 @@ in {
websocketPort = 3012; websocketPort = 3012;
webVaultEnabled = true; webVaultEnabled = true;
# rocketWorkers = 10; # rocketWorkers = 10;
dataDir = "/var/lib/bitwarden_rs";
}; };
environmentFile = config.secrets.vaultwarden.decrypted; environmentFile = config.secrets.vaultwarden.decrypted;
}; };
@ -42,7 +44,7 @@ in {
}; };
persist.state.directories = [ persist.state.directories = [
"/var/lib/bitwarden_rs" config.services.vaultwarden.dataDir
] ++ lib.optionals (config.deviceSpecific.devInfo.fileSystem != "zfs") [ ] ++ lib.optionals (config.deviceSpecific.devInfo.fileSystem != "zfs") [
config.services.vaultwarden.backupDir config.services.vaultwarden.backupDir
]; ];