From 5609944f02f8052fa99a14fe0639423c5e41749b Mon Sep 17 00:00:00 2001 From: chris Date: Thu, 25 Sep 2025 22:59:22 +0200 Subject: [PATCH] improvements data stores and torrent pipeline --- project/media/audiobookshelf/audiobookshelf.yml | 1 - project/media/calibre/calibre.yml | 8 +++++--- project/media/kiwix/kiwix.yml | 3 ++- project/media/qbittorrent/qbittorrent.yml | 4 +++- project/media/readarr/readarr.yml | 6 ++++-- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/project/media/audiobookshelf/audiobookshelf.yml b/project/media/audiobookshelf/audiobookshelf.yml index a6563e3..9555124 100644 --- a/project/media/audiobookshelf/audiobookshelf.yml +++ b/project/media/audiobookshelf/audiobookshelf.yml @@ -11,7 +11,6 @@ services: - ip6net volumes: - ${AUDIOBOOKSHELF_EXTERNAL_PATH}:/audiobooks - # - ${MEDIA_PATH}/data/media/audiobooks:/audiobooks - ${MEDIA_PATH}/audiobookshelf/config:/config - ${MEDIA_PATH}/audiobookshelf/data/metadata:/metadata labels: diff --git a/project/media/calibre/calibre.yml b/project/media/calibre/calibre.yml index 4200d59..4963eb0 100644 --- a/project/media/calibre/calibre.yml +++ b/project/media/calibre/calibre.yml @@ -9,7 +9,8 @@ services: - PASSWORD= #optional - CLI_ARGS= #optional volumes: - - ${MEDIA_PATH}/data/media/ebooks:/config + - ${EXTERNAL_STORAGE}/media/books:/config/library + - ${MEDIA_PATH}/data/downloaded/books:/config/tosync ports: - 2005:8080 # gui - 2006:8181 # gui https @@ -24,6 +25,7 @@ services: - "traefik.http.routers.calibre.rule=Host(`calibre.${LOCAL_DOMAIN}`)" - "traefik.http.routers.calibre.entrypoints=https" - 'traefik.http.routers.calibre.tls=true' + - 'traefik.http.services.calibre.loadbalancer.server.port=8080' calibre-web: extends: @@ -35,9 +37,9 @@ services: - DOCKER_MODS=linuxserver/mods:universal-calibre #optional # - OAUTHLIB_RELAX_TOKEN_SCOPE=1 #optional volumes: - - /path/to/calibre-web/data:/config + - ${EXTERNAL_STORAGE}/media/books:/books - ${MEDIA_PATH}/calibre/data:/config - - ${MEDIA_PATH}/data/media/ebooks:/books + # - ${MEDIA_PATH}/data/media/ebooks:/books ports: - 2008:8083 networks: diff --git a/project/media/kiwix/kiwix.yml b/project/media/kiwix/kiwix.yml index 9770930..5a6dbcf 100644 --- a/project/media/kiwix/kiwix.yml +++ b/project/media/kiwix/kiwix.yml @@ -18,6 +18,7 @@ services: - "com.centurylinklabs.watchtower.enable=true" # Traefik - "traefik.enable=true" - - "traefik.http.routers.kiwix.rule=Host(`kiwix.${LOCAL_DOMAIN}`)" + - "traefik.http.routers.kiwix.rule=Host(`wikipedia.${LOCAL_DOMAIN}`)" - "traefik.http.routers.kiwix.entrypoints=https" - 'traefik.http.routers.kiwix.tls=true' + - 'traefik.http.services.kiwix.loadbalancer.server.port=8080' diff --git a/project/media/qbittorrent/qbittorrent.yml b/project/media/qbittorrent/qbittorrent.yml index 16ddc8d..aacf5e9 100644 --- a/project/media/qbittorrent/qbittorrent.yml +++ b/project/media/qbittorrent/qbittorrent.yml @@ -19,6 +19,8 @@ services: - ${MEDIA_PATH}/qbittorrent/config:/config - ${MEDIA_PATH}/qbittorrent/downloads:/downloads # do not use this folder, see https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths -> issues - ${MEDIA_PATH}/data/torrents:/data/torrents + - ${MEDIA_PATH}/data/downloaded/books:/data/downloaded/books + - ${EXTERNAL_STORAGE}/media/audiobooks:/data/downloaded/audiobooks labels: # Watchtower - "com.centurylinklabs.watchtower.enable=true" @@ -26,4 +28,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.qbittorrent.rule=Host(`qbittorrent.${LOCAL_DOMAIN}`)" - "traefik.http.routers.qbittorrent.entrypoints=https" - - 'traefik.http.routers.qbittorrent.tls=true' \ No newline at end of file + - 'traefik.http.routers.qbittorrent.tls=true' diff --git a/project/media/readarr/readarr.yml b/project/media/readarr/readarr.yml index 1423512..e1b0eb1 100644 --- a/project/media/readarr/readarr.yml +++ b/project/media/readarr/readarr.yml @@ -11,7 +11,9 @@ services: - ip4net volumes: - ${MEDIA_PATH}/readarr/config:/config - - ${MEDIA_PATH}/data:/data + - ${MEDIA_PATH}/data/torrents:/data/torrents + - ${EXTERNAL_STORAGE}/media/audiobooks:/data/media/audiobooks + - ${EXTERNAL_STORAGE}/media/books:/data/media/books labels: # Watchtower - "com.centurylinklabs.watchtower.enable=true" @@ -19,4 +21,4 @@ services: - "traefik.enable=true" - "traefik.http.routers.readarr.rule=Host(`readarr.${LOCAL_DOMAIN}`)" - "traefik.http.routers.readarr.entrypoints=https" - - 'traefik.http.routers.readarr.tls=true' \ No newline at end of file + - 'traefik.http.routers.readarr.tls=true'