From 6ef149afe7ea4c8f5664e8a940767e70f9e865b4 Mon Sep 17 00:00:00 2001
From: thoralmighty <tpj.productions@gmail.com>
Date: Mon, 19 Jun 2023 18:21:24 +0200
Subject: [PATCH] Updated paths to new local mountpoint

---
 jellyfin/docker-compose.yml    |  2 +-
 lighttpd/docker-compose.yml    |  4 ++--
 nextcloud/docker-compose.yml   | 11 +++++++----
 nginx-proxy/docker-compose.yml |  3 ++-
 owncast/docker-compose.yml     | 19 +++++++------------
 photoprism/docker-compose.yml  | 13 ++++++++-----
 pihole/docker-compose.yml      | 13 ++++++++-----
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/jellyfin/docker-compose.yml b/jellyfin/docker-compose.yml
index dfdad23..e2f60e6 100644
--- a/jellyfin/docker-compose.yml
+++ b/jellyfin/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     volumes:
       - ./config:/config
       - ./cache:/cache
-      - /mnt/data/media:/media
+      - /mnt/hdd/Media:/media
 
     #ports:
     #  - "8096:8096/tcp"
diff --git a/lighttpd/docker-compose.yml b/lighttpd/docker-compose.yml
index 86baeb5..77b767a 100644
--- a/lighttpd/docker-compose.yml
+++ b/lighttpd/docker-compose.yml
@@ -5,8 +5,8 @@ services:
         container_name: lighttpd
         image: sebp/lighttpd
         volumes:
-            - /home/thordj/web:/var/www/localhost/htdocs
+            - ./htdocs:/var/www/localhost/htdocs
             - ./config:/etc/lighttpd
         ports:
-            - "80:80"
+            - "8088:80"
         tty: true
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 513fb58..38fb93d 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -12,17 +12,20 @@ services:
       - 8080:80
     volumes:
       - app:/var/www/html
-      - /mnt/data/nextcloud:/var/www/html/data
+      - /mnt/data/nextcloud/files:/var/www/html/data
+      - /mnt/data/nextcloud/config:/var/www/html/config
     environment:
       - MYSQL_PASSWORD=${MYSQL_PASSWORD}
       - MYSQL_DATABASE=${MYSQL_DATABASE}
       - MYSQL_USER=${MYSQL_USER}
       - MYSQL_HOST=${MYSQL_HOST}
+    networks:
+      - mariadb_default
+      - proxy
 
 networks:
-  default:
-    name: mariadb_default
+  mariadb_default:
     external: true
   proxy:
-    name: proxy
+#    name: proxy
     external: true
diff --git a/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml
index 70d0e5b..cdf2d70 100644
--- a/nginx-proxy/docker-compose.yml
+++ b/nginx-proxy/docker-compose.yml
@@ -8,10 +8,11 @@ networks:
 
 services:
   reverse-proxy:
+    container_name: nginx-proxy-manager
     image: "jc21/nginx-proxy-manager:latest"
     restart: always
     ports:
-      - "82:80"
+      - "80:80"
       - "443:443"
       - "81:81"
     environment:
diff --git a/owncast/docker-compose.yml b/owncast/docker-compose.yml
index d41c527..76d7a0c 100644
--- a/owncast/docker-compose.yml
+++ b/owncast/docker-compose.yml
@@ -1,23 +1,18 @@
 version: '3.3'
 
-volumes:
-    data:
-        driver_opts:
-            type: "nfs"
-            o: "addr=192.168.1.245,nolock,soft,rw"
-            device: ":/mnt/data/storage/owncast"
-
 services:
     run:
         volumes:
-            - type: volume
-              source: data
-              target: /app/data
-              volume:
-                 nocopy: true
+            - /mnt/data/storage/owncast:/app/data
         ports:
             - '8085:8080'
             - '1935:1935'
         image: gabekangas/owncast:latest
         restart: always
         container_name: owncast
+        networks:
+            - proxy
+
+networks:
+   proxy:
+      external: true
diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml
index f7e1c18..10fd7f3 100644
--- a/photoprism/docker-compose.yml
+++ b/photoprism/docker-compose.yml
@@ -30,12 +30,10 @@ services:
   photoprism:
     container_name: photoprism
     image: photoprism/photoprism:latest  # :preview to test preview builds
-    #depends_on:
-    #  - mariadb
     ## Don't enable automatic restarts until PhotoPrism has been properly configured and tested!
     ## If the service gets stuck in a restart loop, this points to a memory, filesystem, network, or database issue:
     ## https://docs.photoprism.app/getting-started/troubleshooting/#fatal-server-errors
-    # restart: unless-stopped
+    restart: unless-stopped
     security_opt:
       - seccomp:unconfined
       - apparmor:unconfined
@@ -101,9 +99,12 @@ services:
       # - "~/Import:/photoprism/import"                  # *Optional* base folder from which files can be imported to originals
       # - "./storage:/photoprism/storage"                # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
 
-      - /mnt/data/media/Photos/Originals:/photoprism/originals
-      - /mnt/data/media/Photos/Import:/photoprism/import
+      - /mnt/hdd/Media/Photos/Originals:/photoprism/originals
+      - /mnt/hdd/Media/Photos/Import:/photoprism/import
       - /mnt/data/storage/photoprism:/photoprism/storage
+    networks:
+      - default
+      - proxy
 
   ## -- (database server section removed; use separate mariadb container)
 
@@ -125,3 +126,5 @@ networks:
   default:
     name: mariadb_default
     external: true
+  proxy:
+    external: true
diff --git a/pihole/docker-compose.yml b/pihole/docker-compose.yml
index 7b438cf..095d2aa 100644
--- a/pihole/docker-compose.yml
+++ b/pihole/docker-compose.yml
@@ -16,14 +16,17 @@ services:
       # WEBPASSWORD: 'set a secure password here or it will be random'
     # Volumes store your data between container upgrades
     volumes:
-      - './etc-pihole:/etc/pihole'
-      - './etc-dnsmasq.d:/etc/dnsmasq.d'
+      - '/mnt/data/storage/pihole/etc-pihole:/etc/pihole'
+      - '/mnt/data/storage/pihole/etc-dnsmasq.d:/etc/dnsmasq.d'
     #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
     #cap_add:
     #  - NET_ADMIN # Required if you are using Pi-hole as your DHCP server, else not needed
     restart: unless-stopped
+    networks:
+      - proxy
 
 networks:
-  default:
-    external: true
-    name: proxy
+   default:
+      external: true
+   proxy:
+      external: true