This commit is contained in:
2026-03-20 22:46:26 +01:00
parent 1a1c20e67f
commit 23e343f8cc
2 changed files with 109 additions and 109 deletions
Executable → Regular
+40 -69
View File
@@ -16,54 +16,25 @@ volumes:
radarr_config:
sonarr_config:
bazarr_config:
m-server_music:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/music
m-server_movies:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/movies
m-server_shows:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/shows
nas_shows:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/shows
nas_movies:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/movies
nas_music:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/movies
nas_movies2:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/xxx
nas_live:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/live
# m-server_music:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/music"
# m-server_movies:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/movies"
# m-server_shows:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/shows"
services:
bazarr:
container_name: bazarr
@@ -98,10 +69,10 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- bazarr_config:/config
- m-server_movies:/movies/m-server
- m-server_shows:/tv/m-server
- nas_movies:/movies/nas
- nas_shows:/tv/nas
# - m-server_movies:/movies/m-server
# - m-server_shows:/tv/m-server
- /share/movies:/movies/nas
- /share/shows:/tv/nas
flaresolverr:
container_name: flaresolverr
environment:
@@ -209,14 +180,14 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- jellyfin_config:/config
- m-server_movies:/data/movies/m-server
- m-server_music:/data/music/m-server
- m-server_shows:/data/shows/m-server
- nas_movies:/data/movies/nas
- nas_music:/data/music/nas
- nas_shows:/data/shows/nas
- nas_live:/data/live/nas
- nas_movies2:/data/xxx/nas
# - m-server_movies:/data/movies/m-server
# - m-server_music:/data/music/m-server
# - m-server_shows:/data/shows/m-server
- /share/movies:/data/movies/nas
- /share/music:/data/music/nas
- /share/shows:/data/shows/nas
- /share/live:/data/live/nas
- /share/xxx:/data/xxx/nas
jellyseerr:
container_name: jellyseerr
environment:
@@ -279,8 +250,8 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- lidarr_config:/config
- m-server_music:/music
- /media/m-server/downloads:/downloads
# - m-server_music:/music
- /share/downloads:/downloads
qbittorrent:
container_name: qbittorrent
environment:
@@ -316,7 +287,7 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- qbittorrent_config:/config
- /media/m-server/downloads:/downloads
- /share/downloads:/downloads
radarr:
container_name: radarr
dns:
@@ -350,9 +321,9 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- radarr_config:/config
- m-server_movies:/movies-m-server
- nas_movies:/movies-nas
- /media/m-server/downloads:/downloads
# - m-server_movies:/movies-m-server
- /share/movies:/movies-nas
- /share/downloads:/downloads
sonarr:
container_name: sonarr
dns:
@@ -385,6 +356,6 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- sonarr_config:/config
- m-server_shows:/tv-m-server
- nas_shows:/tv-nas
- /media/m-server/downloads:/downloads
# - m-server_shows:/tv-m-server
- /share/shows:/tv-nas
- /share/downloads:/downloads
+69 -40
View File
@@ -16,25 +16,54 @@ volumes:
radarr_config:
sonarr_config:
bazarr_config:
# m-server_music:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/music"
# m-server_movies:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/movies"
# m-server_shows:
# driver: local
# driver_opts:
# type: nfs
# o: addr=192.168.77.101,rw,nfsvers=4.1,nolock,nofail
# device: "192.168.77.101:/shows"
m-server_music:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/music
m-server_movies:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/movies
m-server_shows:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.101,rw,nfsvers=4.2,nolock,nofail
device: :/shows
nas_shows:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/shows
nas_movies:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/movies
nas_music:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/movies
nas_movies2:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/xxx
nas_live:
driver: local
driver_opts:
type: nfs
o: addr=192.168.77.106,rw,nfsvers=4.1,nolock,nofail
device: :/live
services:
bazarr:
container_name: bazarr
@@ -69,10 +98,10 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- bazarr_config:/config
# - m-server_movies:/movies/m-server
# - m-server_shows:/tv/m-server
- /share/movies:/movies/nas
- /share/shows:/tv/nas
- m-server_movies:/movies/m-server
- m-server_shows:/tv/m-server
- nas_movies:/movies/nas
- nas_shows:/tv/nas
flaresolverr:
container_name: flaresolverr
environment:
@@ -180,14 +209,14 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- jellyfin_config:/config
# - m-server_movies:/data/movies/m-server
# - m-server_music:/data/music/m-server
# - m-server_shows:/data/shows/m-server
- /share/movies:/data/movies/nas
- /share/music:/data/music/nas
- /share/shows:/data/shows/nas
- /share/live:/data/live/nas
- /share/xxx:/data/xxx/nas
- m-server_movies:/data/movies/m-server
- m-server_music:/data/music/m-server
- m-server_shows:/data/shows/m-server
- nas_movies:/data/movies/nas
- nas_music:/data/music/nas
- nas_shows:/data/shows/nas
- nas_live:/data/live/nas
- nas_movies2:/data/xxx/nas
jellyseerr:
container_name: jellyseerr
environment:
@@ -250,8 +279,8 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- lidarr_config:/config
# - m-server_music:/music
- /share/downloads:/downloads
- m-server_music:/music
- /media/m-server/downloads:/downloads
qbittorrent:
container_name: qbittorrent
environment:
@@ -287,7 +316,7 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- qbittorrent_config:/config
- /share/downloads:/downloads
- /media/m-server/downloads:/downloads
radarr:
container_name: radarr
dns:
@@ -321,9 +350,9 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- radarr_config:/config
# - m-server_movies:/movies-m-server
- /share/movies:/movies-nas
- /share/downloads:/downloads
- m-server_movies:/movies-m-server
- nas_movies:/movies-nas
- /media/m-server/downloads:/downloads
sonarr:
container_name: sonarr
dns:
@@ -356,6 +385,6 @@ services:
restart: ${RESTART:-unless-stopped}
volumes:
- sonarr_config:/config
# - m-server_shows:/tv-m-server
- /share/shows:/tv-nas
- /share/downloads:/downloads
- m-server_shows:/tv-m-server
- nas_shows:/tv-nas
- /media/m-server/downloads:/downloads