br v4

2026-10-07 20:47:14 +03:00 · 2026-08-11 22:13:53 +03:00
parent 056e5895fe
commit 411c118500
29 changed files with 543 additions and 517 deletions
@@ -42,21 +42,30 @@ in
    # };
  };

-  systemd.tmpfiles.rules = [
-    "d ${libraryDir} 0755 calibre-web calibre-web -"
-    "d ${sourceDir} 0755 calibre-web calibre-web -"
-    "Z ${libraryDir} 0755 calibre-web calibre-web -"
-    "Z ${sourceDir} 0755 calibre-web calibre-web -"
-  ];
-
-  fileSystems = {
-    "${targetDir}" = {
-      device = "${sourceDir}";
-      fsType = "none";
-      options = [
-        "bind"
-        "nofail"
+  systemd.tmpfiles.rules =
+    xlib.helpers.mkTmpDirs {
+      dir = libraryDir;
+      mode = "0755";
+      user = "calibre-web";
+      group = "calibre-web";
+      types = [
+        "d"
+        "Z"
+      ];
+    }
+    ++ xlib.helpers.mkTmpDirs {
+      dir = sourceDir;
+      mode = "0755";
+      user = "calibre-web";
+      group = "calibre-web";
+      types = [
+        "d"
+        "Z"
      ];
    };
+
+  fileSystems = xlib.helpers.mkBindMount {
+    what = sourceDir;
+    where = targetDir;
  };
 }