diff options
| author | Charles Hall <charles@computer.surgery> | 2023-10-24 14:58:13 -0700 |
|---|---|---|
| committer | Charles Hall <charles@computer.surgery> | 2023-10-24 22:03:21 -0700 |
| commit | f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c (patch) | |
| tree | f2f71b49acc081251e043868099c59fe309c2f71 /nixos/modules/services/web-servers | |
| parent | 85933f5deb474017763af50234479ee77e33d105 (diff) | |
| download | nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar.gz nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar.bz2 nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar.lz nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar.xz nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.tar.zst nixpkgs-f5dcc015b9075dd3c2c16c6a6ec8658991d1e97c.zip | |
nixos/garage: set `StateDirectory` if used at all
Changes the `mkIf` to trigger if *either* `data_dir`/`metadata_dir` use `/var/lib/garage`, not only if both do. This is useful to me because I want to store metadata in `/var/lib/garage` but I also want to store data in a different mountpoint (via `data_dir` and `ReadWritePaths`).
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 731d5315f23..47b4c6ab416 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; |