diff --git a/docker-compose.yaml b/docker-compose.yaml index fa4a869..26b3964 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -135,7 +135,8 @@ services: TYPE: "FABRIC" MEMORY: "4G" MOTD: "Loading server..." - VERSION: "1.21.11" + # VERSION: "1.21.11" + VERSION: "26.1" # LEVEL: "world" LEVEL: "house" SEED: "881949285698121329" @@ -146,7 +147,10 @@ services: 187eca31-2e33-4199-97e0-2286bf35f7f8 ENABLE_WHITELIST: "true" WHITELIST: |- - 187eca31-2e33-4199-97e0-2286bf35f7f8 + 187eca31-2e33-4199-97e0-2286bf35f7f8, + 5d341a01-506c-4473-a530-1ae9188c03c7, + 34586a37-772e-4da4-86a1-6704f286d4c6, + 1ff2724b-168f-4b17-8cf2-850894b34ead PAUSE_WHEN_EMPTY_SECONDS: "20" ENABLE_ROLLING_LOGS: "true" REMOVE_OLD_MODS: "TRUE" diff --git a/jellyfin-compose.yaml b/jellyfin-compose.yaml index 13ccbda..4d7728d 100644 --- a/jellyfin-compose.yaml +++ b/jellyfin-compose.yaml @@ -135,6 +135,10 @@ services: - PUID=0 - PGID=0 - TZ=${TZ} + - JELLYFIN_DATA_DIR=/config/data + - JELLYFIN_CONFIG_DIR=/config + - JELLYFIN_LOG_DIR=/config/log + - JELLYFIN_CACHE_DIR=/config/cache # - NVIDIA_VISIBLE_DEVICES=all ports: # - 8096:8096 @@ -146,7 +150,9 @@ services: volumes: - /data/library:/data/library:ro - /data/jellyfin:/data/jellyfin - - /data/jellyfin/configs/jellyfin:/config + - /backup:/data/jellyfin/backups + # - /data/jellyfin/configs/jellyfin:/config + - /srv/jellyfin:/config - /data/jellyfin/jellyfin/cache:/cache - /data/jellyfin/sonarr/tv:/data/tvshows - /data/jellyfin/radarr/movies:/data/movies diff --git a/matrix-compose.yaml b/matrix-compose.yaml index 57554a5..28096c9 100644 --- a/matrix-compose.yaml +++ b/matrix-compose.yaml @@ -19,9 +19,9 @@ services: - matrix # ports: # - 8448:6167 - turn: - image: docker.io/coturn/coturn - restart: unless-stopped - network_mode: "host" - volumes: - - ./coturn.conf:/etc/coturn/turnserver.conf:ro + # turn: + # image: docker.io/coturn/coturn + # restart: unless-stopped + # network_mode: "host" + # volumes: + # - ./coturn.conf:/etc/coturn/turnserver.conf:ro