diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-27 18:01:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-27 18:01:08 +0000 |
commit | 4c838ddf1475e374bb34f17c0456fdffec5c2854 (patch) | |
tree | 69605ea0660ea80cd1183fdca9b6a58c41e2aed1 /nixos/modules/services/web-servers | |
parent | f65ccb3163adc4b6e72547c893d6f614defa0b3a (diff) | |
parent | 3e8e17821822ef190d72db3a612ea9be5a441ca9 (diff) |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/web-servers')
-rw-r--r-- | nixos/modules/services/web-servers/garage.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix index 731d5315f23aa..47b4c6ab416e8 100644 --- a/nixos/modules/services/web-servers/garage.nix +++ b/nixos/modules/services/web-servers/garage.nix @@ -86,7 +86,7 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/garage server"; - StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir && hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; + StateDirectory = mkIf (hasPrefix "/var/lib/garage" cfg.settings.data_dir || hasPrefix "/var/lib/garage" cfg.settings.metadata_dir) "garage"; DynamicUser = lib.mkDefault true; ProtectHome = true; NoNewPrivileges = true; |