From 4d3d3e46fec7e9d12c8c01893818f238bfd3a8d9 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Wed, 18 Sep 2024 17:17:34 -0600
Subject: [PATCH] nixos/garage: fix StateDirectory check to work with multiple
 data_dirs

---
 nixos/modules/services/web-servers/garage.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/garage.nix b/nixos/modules/services/web-servers/garage.nix
index 757479259fd8..05c92b1a387b 100644
--- a/nixos/modules/services/web-servers/garage.nix
+++ b/nixos/modules/services/web-servers/garage.nix
@@ -11,6 +11,13 @@ let
   cfg = config.services.garage;
   toml = pkgs.formats.toml { };
   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
 {
   meta = {
@@ -162,7 +169,7 @@ in
         ExecStart = "${cfg.package}/bin/garage server";
 
         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
         ) "garage";
         DynamicUser = lib.mkDefault true;