From 8ee56130d3b281cc6845bc71ede237571f05f680 Mon Sep 17 00:00:00 2001
From: SweetId <2630750+SweetId@users.noreply.github.com>
Date: Mon, 30 Dec 2024 14:44:37 -0500
Subject: [PATCH] Updating Jellyfin stack

---
 Jellyfin/docker-compose.yaml | 43 ++++++++++--------------------------
 Jellyfin/stack.env           | 17 +++++++-------
 2 files changed, 20 insertions(+), 40 deletions(-)

diff --git a/Jellyfin/docker-compose.yaml b/Jellyfin/docker-compose.yaml
index 3a5d987..7f07637 100644
--- a/Jellyfin/docker-compose.yaml
+++ b/Jellyfin/docker-compose.yaml
@@ -3,43 +3,24 @@ version: '3'
 services:
   jellyfin:
     image: jellyfin/jellyfin:latest
-    restart: unless-stopped
+    restart: always
+    #extra_hosts:
+    #  - hostname:ip # add this if smb share is mounted with hostname
     ports:
       - 1900:1900
       - 7359:7359
       - ${JELLYFIN_PORT_HTTP}:8096
       - ${JELLYFIN_PORT_HTTPS}:8920
     volumes:
-      - ./cache:/cache
-      - ${JELLYFIN_DIR}:/config:r
-      - ${JELLYFIN_MEDIA_DIR}:/data/media:ro
+      - ${JELLYFIN_CONFIG_DIR}:/cache
+      - ${JELLYFIN_CACHE_DIR}:/config:r
+      - nas-drive:/data/media:ro
     env_file:
       - stack.env
-    labels:
-      - traefik.enable=true
 
-      # HTTP redirection to HTTPS
-      - traefik.http.routers.jellyfin.entrypoints=web
-      - traefik.http.routers.jellyfin.rule=Host(`${JELLYFIN_URL}`)
-      - traefik.http.middlewares.jellyfin-https-redirect.redirectscheme.scheme=https
-      - traefik.http.routers.jellyfin.middlewares=jellyfin-https-redirect
-
-      # HTTPS config
-      - traefik.http.routers.jellyfin-secure.entrypoints=websecure
-      - traefik.http.routers.jellyfin-secure.rule=Host(`${JELLYFIN_URL}`)
-      - traefik.http.routers.jellyfin-secure.tls=true
-      - traefik.http.routers.jellyfin-secure.tls.certresolver=myresolver
-      - traefik.http.services.jellyfin-secure.loadbalancer.server.port=8096
-      
-      - traefik.docker.network=proxy
-
-      - homepage.group=Media
-      - homepage.name=Jellyfin
-      - homepage.icon=jellyfin.png
-      - homepage.href=${JELLYFIN_URL}
-      - homepage.description=Movies 
-      - homepage.widget.type=jellyfin
-      - homepage.widget.url=${JELLYFIN_URL}
-      - homepage.widget.key=${JELLYFIN_API_KEY}
-      - homepage.widget.enableBlocks=true
-      - homepage.widget.enableNowPlaying=false
+volumes: 
+  nas-drive:
+    driver_opts:
+      type: cifs
+      o: username=${SAMBA_USERNAME},password=${SAMBA_PASSWORD},vers=3.0
+      device: ${JELLYFIN_DATA_DIR}
\ No newline at end of file
diff --git a/Jellyfin/stack.env b/Jellyfin/stack.env
index d06ea5b..90f861b 100644
--- a/Jellyfin/stack.env
+++ b/Jellyfin/stack.env
@@ -1,11 +1,10 @@
+PUID=1000
+PGID=1000
+TZ=America/Toronto
 JELLYFIN_PORT_HTTP=8096
 JELLYFIN_PORT_HTTPS=8920
-JELLYFIN_URL=jellyfin.example.com
-JELLYFIN_API_KEY=YourApiKey
-
-JELLYFIN_DIR=/path/to/jelly
-JELLYFIN_MEDIA_DIR=/path/to/media
-
-TZ=America/Toronto
-PUID=1000
-PGID=1000
\ No newline at end of file
+JELLYFIN_CONFIG_DIR=/home/portainer/jellyfin/config
+JELLYFIN_CACHE_DIR=/home/portainer/jellyfin/cache
+JELLYFIN_DATA_DIR=
+SAMBA_USERNAME=
+SAMBA_PASSWORD=
\ No newline at end of file