movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/garage: fix StateDirectory check to work with multiple data_dirs

Browse source
This commit is contained in:
Matt Moriarity 2024-09-18 17:17:34 -06:00
parent cb905a5649
commit 4d3d3e46fe
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
nixos/modules/services/web-servers/garage.nix
View file

@ -11,6 +11,13 @@ let
cfg = config.services.garage; cfg = config.services.garage;
toml = pkgs.formats.toml { }; toml = pkgs.formats.toml { };
configFile = toml.generate "garage.toml" cfg.settings; configFile = toml.generate "garage.toml" cfg.settings;
anyHasPrefix =
prefix: strOrList:
if isString strOrList then
hasPrefix prefix strOrList
else
any ({ path, ... }: hasPrefix prefix path) strOrList;
in in
{ {
meta = { meta = {
@ -162,7 +169,7 @@ in
ExecStart = "${cfg.package}/bin/garage server"; ExecStart = "${cfg.package}/bin/garage server";
StateDirectory = mkIf ( StateDirectory = mkIf (
hasPrefix "/var/lib/garage" cfg.settings.data_dir anyHasPrefix "/var/lib/garage" cfg.settings.data_dir
|| hasPrefix "/var/lib/garage" cfg.settings.metadata_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir
) "garage"; ) "garage";
DynamicUser = lib.mkDefault true; DynamicUser = lib.mkDefault true;