From 206fa153dc693cba963eebfd96d6d841d8ad5b85 Mon Sep 17 00:00:00 2001
From: Nick Yeoman <c@nickyeoman.com>
Date: Sat, 25 Jan 2025 18:08:08 -0800
Subject: [PATCH] changed vol path, proxy, u pdated env files, minor fixes

---
 nginx-proxy-manager/docker-compose.yml |  4 ++--
 nginx-proxy-manager/sample-extends.yml |  4 ----
 portainer/docker-compose.yml           |  5 +----
 portainer/sample-extends.yml           | 11 +++++------
 qbittorrent/docker-compose.yml         |  6 +++---
 5 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/docker-compose.yml
index ffea373..87893fe 100644
--- a/nginx-proxy-manager/docker-compose.yml
+++ b/nginx-proxy-manager/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       - "81:81"
       - "443:443"
     volumes:
-      - "${VOL_PATH:-./data}/proxy-data:/data"
-      - "${VOL_PATH:-./data}/proxy-letsencrypt:/etc/letsencrypt"
+      - "${VOL_PATH:-./data}/proxy/data:/data"
+      - "${VOL_PATH:-./data}/proxy/letsencrypt:/etc/letsencrypt"
     networks:
       - proxy
diff --git a/nginx-proxy-manager/sample-extends.yml b/nginx-proxy-manager/sample-extends.yml
index 90d8f85..ac43e45 100644
--- a/nginx-proxy-manager/sample-extends.yml
+++ b/nginx-proxy-manager/sample-extends.yml
@@ -1,9 +1,5 @@
-version: '3.4'
-
 services:
   proxy:
     extends:
       file: ${COOKBOOK}/nginx-proxy-manager/docker-compose.yml
       service: proxy
-    env_file:
-      - .env
\ No newline at end of file
diff --git a/portainer/docker-compose.yml b/portainer/docker-compose.yml
index 7b52ea5..fdcd0c3 100644
--- a/portainer/docker-compose.yml
+++ b/portainer/docker-compose.yml
@@ -9,8 +9,6 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - "${VOL_PATH:-./config}/portainer:/data"
     restart: always
-    networks:
-      - portainer-net
   
   portainer-agent:
     image: ${PORTAINER_AGENT_IMAGE:-portainer/agent:latest}
@@ -22,5 +20,4 @@ services:
     ports:
       - 9001:9001
     restart: always
-    networks:
-      - portainer-net
+    
diff --git a/portainer/sample-extends.yml b/portainer/sample-extends.yml
index 11db530..66dc60a 100644
--- a/portainer/sample-extends.yml
+++ b/portainer/sample-extends.yml
@@ -1,5 +1,3 @@
-version: '3.4'
-
 networks:
 	portainer-net:
 	external: true
@@ -9,12 +7,13 @@ services:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer-agent
-		env_file:
-			- .env
+		networks:
+			- portainer-net
 
 	portainer:
 		extends:
 			file: ${COOKBOOK}/portainer/docker-compose.yml
 			service: portainer
-		env_file:
-			- .env
\ No newline at end of file
+		networks:
+			- portainer-net
+			- proxy
diff --git a/qbittorrent/docker-compose.yml b/qbittorrent/docker-compose.yml
index cf064be..630c48e 100644
--- a/qbittorrent/docker-compose.yml
+++ b/qbittorrent/docker-compose.yml
@@ -5,9 +5,9 @@ services:
       - VPN_TYPE=wireguard
       - WEBUI_PASSWORD=${QBT_PASS:-ChangeMePass}
     volumes:
-      - "${VOL_CONFIG_PATH:-./data}/config:/config"
-      - "${VOL_PATH:-./data}/downloads:/downloads"
-      - "${VOL_PATH:-./data}/incomplete:/incomplete"
+      - "${VOL_CONFIG_PATH:-./data}/qbit/config:/config"
+      - "${VOL_PATH:-./data}/qbit/downloads:/downloads"
+      - "${VOL_PATH:-./data}/qbit/incomplete:/incomplete"
       - '/dev/net/tun:/dev/net/tun'
     ports:
      - 8080:8080