From ecba15cf2e2cd635369c663e5a195362ffbc8e1a Mon Sep 17 00:00:00 2001
From: Scott Barning <ssbarning@gmail.com>
Date: Thu, 30 Nov 2023 11:50:00 -0500
Subject: [PATCH] fixed a few volume issues and added nfs override

---
 overrides-available/librephotos-nfs.yml     | 35 +++++++++++++++++++++
 services-available/untested/librephotos.yml | 15 +++++----
 2 files changed, 42 insertions(+), 8 deletions(-)
 create mode 100644 overrides-available/librephotos-nfs.yml

diff --git a/overrides-available/librephotos-nfs.yml b/overrides-available/librephotos-nfs.yml
new file mode 100644
index 00000000..bfb04d4b
--- /dev/null
+++ b/overrides-available/librephotos-nfs.yml
@@ -0,0 +1,35 @@
+version: '3'
+    
+volumes:
+  librephotos-nfs-scan:
+    labels:
+      - remove_volume_on=down
+    driver_opts:
+      type: nfs
+      o: "addr=${LIBREPHOTOS_ROOT_NFS_SERVER:-${NFS_SERVER}},nolock,noatime,soft,rw"
+      device: ":${LIBREPHOTOS_ROOT_NFS_SERVER_PATH:-${NFS_LIBREPHOTOS_SCAN_PATH}}"
+  librephotos-nfs-data:
+    labels:
+      - remove_volume_on=down
+    driver_opts:
+      type: nfs
+      o: "addr=${LIBREPHOTOS_ROOT_NFS_SERVER:-${NFS_SERVER}},nolock,noatime,soft,rw"
+      device: ":${LIBREPHOTOS_ROOT_NFS_SERVER_PATH:-${NFS_LIBREPHOTOS_DATA_PATH}}"
+
+services:
+  proxy:
+    volumes:
+      - librephotos-nfs-scan:/data
+      - librephotos-nfs-data:/protected_media
+      - /etc/timezone:/etc/timezone:ro
+      - /etc/localtime:/etc/localtime:ro
+  db:
+    volumes:
+      - librephotos-nfs-data:/var/lib/postgresql/data
+  backend:
+    volumes:
+      - librephotos-nfs-scan:/data
+      - librephotos-nfs-data:/protected_media
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/logs:/logs
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/cache:/root/.cache
+
diff --git a/services-available/untested/librephotos.yml b/services-available/untested/librephotos.yml
index a4ba55d0..d3f80563 100644
--- a/services-available/untested/librephotos.yml
+++ b/services-available/untested/librephotos.yml
@@ -11,8 +11,8 @@ services:
     container_name: ${LIBREPHOTOS_PROXY_CONTAINER_NAME:-librephotos} 
     restart: ${LIBREPHOTOS_RESTART:-unless-stopped}
     volumes:
-      - ${LIBREPHOTOS_SCAN_DIRECTORY:-./etc/librephotos/data}:/data
-      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/protected_media}:/protected_media
+      - ${LIBREPHOTOS_SCAN_DIRECTORY:-./etc/librephotos/pictures}:/data
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/protected_media:/protected_media
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     depends-on:
@@ -52,7 +52,7 @@ services:
     networks:
       - traefik
     volumes:
-      - ${data}/db:/var/lib/postgresql/data
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/db:/var/lib/postgresql/data
     command: postgres -c fsync=off -c synchronous_commit=off -c full_page_writes=off -c random_page_cost=1.0
     healthcheck:
       test: psql -U ${dbUser} -d ${dbName} -c "SELECT 1;"
@@ -71,11 +71,10 @@ services:
     image: reallibrephotos/librephotos:${LIBREPHOTOS_DOCKER_TAG:-latest}
     container_name: ${LIBREPHOTOS_BACKEND_CONTAINER_NAME:-librephotos-backend}
     volumes:
-      - ${LIBREPHOTOS_SCAN_DIRECTORY:-./etc/librephotos/data}:/data
-      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/protected_media}:/protected_media
-      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/logs}:/logs
-      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/cache}:/root/.cache
-      - ${LIBREPHOTOS_CODE_DIRECTORY:-./etc/librephotos/code}:/code
+      - ${LIBREPHOTOS_SCAN_DIRECTORY:-./etc/librephotos/pictures}:/data
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/protected_media:/protected_media
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/logs:/logs
+      - ${LIBREPHOTOS_DATA_DIRECTORY:-./etc/librephotos/data}/cache:/root/.cache
     networks:
       - traefik
     environment: