From 6ece311c24dd6a4b3dbbf8525a3a61854a32838d Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Tue, 12 Mar 2024 21:00:01 -0700 Subject: [PATCH] Split out Media share into three components: Movies, Shows, and Music --- fighter/config/autopirate/.env | 4 +++- .../autopirate/docker-compose-nvidia.yml | 22 +++++++++---------- fighter/config/autopirate/docker-compose.yml | 22 +++++++++---------- fighter/config/jellyfin/.env | 3 ++- fighter/config/jellyfin/docker-compose.yml | 4 ++-- fighter/config/plex/.env | 4 +++- fighter/config/plex/docker-compose-nvidia.yml | 6 ++--- fighter/config/plex/docker-compose.yml | 6 ++--- 8 files changed, 38 insertions(+), 33 deletions(-) diff --git a/fighter/config/autopirate/.env b/fighter/config/autopirate/.env index a242010..eade9d1 100644 --- a/fighter/config/autopirate/.env +++ b/fighter/config/autopirate/.env @@ -1,6 +1,8 @@ DOCKER_DATA=/mnt/nas/iscsi/autopirate DOCKER_DATA_LOCAL=/home/admin/data/autopirate -MEDIA_DIR=/mnt/nas/media +MOVIES_DIR=/mnt/nas/movies +SHOWS_DIR=/mnt/nas/shows +MUSIC_DIR=/mnt/nas/music NZB_DIR=/mnt/nas/iscsi/torrenting/NZB INCOMPLETE_NZB_DIR=/mnt/nas/iscsi/torrenting/NZB_incomplete TRANSCODE_DIR=/mnt/nas/iscsi/tdarr diff --git a/fighter/config/autopirate/docker-compose-nvidia.yml b/fighter/config/autopirate/docker-compose-nvidia.yml index 85ebc4b..0ebb4eb 100644 --- a/fighter/config/autopirate/docker-compose-nvidia.yml +++ b/fighter/config/autopirate/docker-compose-nvidia.yml @@ -8,7 +8,7 @@ services: env_file: - autopirate.env volumes: - - "${MEDIA_DIR}/Video/Movies:/movies" + - "${MOVIES_DIR}:/movies" - "${DOCKER_DATA}/radarr_config:/config" - "${NZB_DIR}:/downloads" labels: @@ -25,7 +25,7 @@ services: env_file: - autopirate.env volumes: - - "${MEDIA_DIR}/Video/Shows:/shows" + - "${SHOWS_DIR}:/shows" - "${DOCKER_DATA}/sonarr_config:/config" - "${NZB_DIR}:/downloads" labels: @@ -43,8 +43,8 @@ services: - autopirate.env volumes: - "${DOCKER_DATA_LOCAL}/bazarr:/config" - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/tv" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/tv" labels: - traefik.http.routers.bazarr.rule=Host(`bazarr.jafner.net`) - traefik.http.routers.bazarr.tls.certresolver=lets-encrypt @@ -79,9 +79,9 @@ services: - 8085:8080 volumes: - "${DOCKER_DATA_LOCAL}/sabnzbd_config:/config" - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/shows" - - "${MEDIA_DIR}/Audio/Music:/music" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/shows" + - "${MUSIC_DIR}:/music" - "${NZB_DIR}:/downloads" - "${INCOMPLETE_NZB_DIR}:/incomplete-downloads" labels: @@ -113,8 +113,8 @@ services: - ${DOCKER_DATA}/tdarr/server:/app/server - ${DOCKER_DATA}/tdarr/configs:/app/configs - ${DOCKER_DATA}/tdarr/logs:/app/logs - - ${MEDIA_DIR}/Video/Movies:/movies - - ${MEDIA_DIR}/Video/Shows:/shows + - ${MOVIES_DIR}:/movies + - ${SHOWS_DIR}:/shows - ${TRANSCODE_DIR}/transcode_cache:/temp tdarr-node: @@ -138,8 +138,8 @@ services: volumes: - ${DOCKER_DATA}/tdarr/configs:/app/configs - ${DOCKER_DATA}/tdarr/logs:/app/logs - - ${MEDIA_DIR}/Video/Movies:/movies - - ${MEDIA_DIR}/Video/Shows:/shows + - ${MOVIES_DIR}:/movies + - ${SHOWS_DIR}:/shows - ${TRANSCODE_DIR}/transcode_cache:/temp jackett: diff --git a/fighter/config/autopirate/docker-compose.yml b/fighter/config/autopirate/docker-compose.yml index 8f27efa..9ddff27 100644 --- a/fighter/config/autopirate/docker-compose.yml +++ b/fighter/config/autopirate/docker-compose.yml @@ -9,7 +9,7 @@ services: - path: ./autopirate.env required: true volumes: - - "${MEDIA_DIR}/Video/Movies:/movies" + - "${MOVIES_DIR}:/movies" - "${DOCKER_DATA}/radarr_config:/config" - "${NZB_DIR}:/downloads" labels: @@ -27,7 +27,7 @@ services: - path: ./autopirate.env required: true volumes: - - "${MEDIA_DIR}/Video/Shows:/shows" + - "${SHOWS_DIR}:/shows" - "${DOCKER_DATA}/sonarr_config:/config" - "${NZB_DIR}:/downloads" labels: @@ -46,8 +46,8 @@ services: required: true volumes: - "${DOCKER_DATA_LOCAL}/bazarr:/config" - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/tv" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/tv" labels: - traefik.http.routers.bazarr.rule=Host(`bazarr.jafner.net`) - traefik.http.routers.bazarr.tls.certresolver=lets-encrypt @@ -84,9 +84,9 @@ services: - 8085:8080 volumes: - "${DOCKER_DATA_LOCAL}/sabnzbd_config:/config" - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/shows" - - "${MEDIA_DIR}/Audio/Music:/music" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/shows" + - "${MUSIC_DIR}:/music" - "${NZB_DIR}:/downloads" - "${INCOMPLETE_NZB_DIR}:/incomplete-downloads" labels: @@ -120,8 +120,8 @@ services: - ${DOCKER_DATA}/tdarr/server:/app/server - ${DOCKER_DATA}/tdarr/configs:/app/configs - ${DOCKER_DATA}/tdarr/logs:/app/logs - - ${MEDIA_DIR}/Video/Movies:/movies - - ${MEDIA_DIR}/Video/Shows:/shows + - ${MOVIES_DIR}:/movies + - ${SHOWS_DIR}:/shows - ${TRANSCODE_DIR}/transcode_cache:/temp tdarr-node: @@ -138,8 +138,8 @@ services: volumes: - ${DOCKER_DATA}/tdarr/configs:/app/configs - ${DOCKER_DATA}/tdarr/logs:/app/logs - - ${MEDIA_DIR}/Video/Movies:/movies - - ${MEDIA_DIR}/Video/Shows:/shows + - ${MOVIES_DIR}:/movies + - ${SHOWS_DIR}:/shows - ${TRANSCODE_DIR}/transcode_cache:/temp jackett: diff --git a/fighter/config/jellyfin/.env b/fighter/config/jellyfin/.env index 5d19e7e..0074646 100644 --- a/fighter/config/jellyfin/.env +++ b/fighter/config/jellyfin/.env @@ -1,2 +1,3 @@ -MEDIA_DIR=/mnt/nas/media +MOVIES_DIR=/mnt/nas/movies +SHOWS_DIR=/mnt/nas/shows DOCKER_DATA=/home/admin/data/jellyfin \ No newline at end of file diff --git a/fighter/config/jellyfin/docker-compose.yml b/fighter/config/jellyfin/docker-compose.yml index 6f9ef02..97efaed 100644 --- a/fighter/config/jellyfin/docker-compose.yml +++ b/fighter/config/jellyfin/docker-compose.yml @@ -13,8 +13,8 @@ services: - path: ./jellyfin.env required: true volumes: - - "${MEDIA_DIR}/Video/Movies:/data/movies" - - "${MEDIA_DIR}/Video/Shows:/data/tvshows" + - "${MOVIES_DIR}:/data/movies" + - "${SHOWS_DIR}:/data/tvshows" - "${DOCKER_DATA}/jellyfin:/config" labels: - traefik.http.routers.jellyfin.rule=Host(`jellyfin.jafner.net`) diff --git a/fighter/config/plex/.env b/fighter/config/plex/.env index c1ba45c..f3f3e50 100644 --- a/fighter/config/plex/.env +++ b/fighter/config/plex/.env @@ -1,2 +1,4 @@ DOCKER_DATA=/home/admin/data/plex -MEDIA_DIR=/mnt/nas/media +MOVIES_DIR=/mnt/nas/movies +SHOWS_DIR=/mnt/nas/shows +MUSIC_DIR=/mnt/nas/music \ No newline at end of file diff --git a/fighter/config/plex/docker-compose-nvidia.yml b/fighter/config/plex/docker-compose-nvidia.yml index 8387712..d45b964 100644 --- a/fighter/config/plex/docker-compose-nvidia.yml +++ b/fighter/config/plex/docker-compose-nvidia.yml @@ -29,9 +29,9 @@ services: - plex.env - plex_secrets.env volumes: - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/shows" - - "${MEDIA_DIR}/Audio/Music:/music" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/shows" + - "${MUSIC_DIR}:/music" - "${DOCKER_DATA}/plex:/config" labels: - traefik.http.routers.plex.rule=Host(`plex.jafner.net`) diff --git a/fighter/config/plex/docker-compose.yml b/fighter/config/plex/docker-compose.yml index fb60105..899bda6 100644 --- a/fighter/config/plex/docker-compose.yml +++ b/fighter/config/plex/docker-compose.yml @@ -25,9 +25,9 @@ services: - path: ./plex_secrets.env required: false volumes: - - "${MEDIA_DIR}/Video/Movies:/movies" - - "${MEDIA_DIR}/Video/Shows:/shows" - - "${MEDIA_DIR}/Audio/Music:/music" + - "${MOVIES_DIR}:/movies" + - "${SHOWS_DIR}:/shows" + - "${MUSIC_DIR}:/music" - "${DOCKER_DATA}/plex:/config" labels: - traefik.http.routers.plex.rule=Host(`plex.jafner.net`)