fix: add correct dir initialization to immich & calibre

tiborpilz · Mar 1, 2024 · 124e46e · 124e46e
1 parent 57387c0
commit 124e46e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/modules/nixos/services/media/calibre.nix b/modules/nixos/services/media/calibre.nix
@@ -8,6 +8,7 @@ let
   calibreWebPort = 8083;
   calibreConfigDir = "/var/lib/calibre/config";
   calibreWebConfigDir = "/var/lib/calibre-web/config";
+  mediaDir = "/data/media";
   cfg = config.modules.services.media.calibre;
 in
 {
@@ -19,6 +20,7 @@ in
     system.activationScripts.makeCalibreDir = stringAfter [ "var" ] ''
       mkdir -p ${calibreConfigDir}
       mkdir -p ${calibreWebConfigDir}
+      mkdir -p ${mediaDir}/books
     '';
 
     virtualisation.oci-containers.containers.calibre = {
@@ -29,7 +31,7 @@ in
       ];
       volumes = [
         "${calibreConfigDir}:/config"
-        "/data/media/books:/books"
+        "${mediaDir}/books:/books"
       ];
       environment = {
         "TZ" = "Europe/Berlin";

diff --git a/modules/nixos/services/media/immich.nix b/modules/nixos/services/media/immich.nix
@@ -4,6 +4,7 @@ with lib.my;
 
 let
   dataDir = "/data/media/immich";
+  photoDir = "/data/media/photos";
   publicPort = 2283;
   cfg = config.modules.services.media.immich;
 in
@@ -31,6 +32,7 @@ in
   config = mkIf cfg.enable {
     system.activationScripts.immich = stringAfter [ "var" ] ''
       mkdir -p ${dataDir}/upload
+      mkdir -p ${photoDir}
     '';
 
     modules.podgroups.pods.immich = {
@@ -41,7 +43,7 @@ in
         cmd = [ "start-server.sh" ];
         volumes = [
           "${dataDir}/upload:/usr/src/app/upload"
-          "/data/media/photos:/data/media/photos"
+          "${photoDir}:/data/media/photos"
           "/etc/localtime:/etc/localtime:ro"
         ];
         environment = {