From 491d5f70ef4f7537b3379e2742bc90e0b2b22961 Mon Sep 17 00:00:00 2001
From: Luctia <timmerman.luc1999@gmail.com>
Date: Sun, 3 Jul 2022 16:56:44 +0200
Subject: [PATCH] Added Jellyfin and improved documentation

---
 .env.sample        |  5 +++++
 README.md          | 23 ++++++++++++++---------
 docker-compose.yml | 21 +++++++++++++++++----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/.env.sample b/.env.sample
index f7ea9d2..4987e06 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,3 +1,8 @@
+# If you're not sure what timezone you should fill in, you can look at the following list:
+# https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+# Use the column that says "TZ database name".
 TIMEZONE=Europe/Amsterdam
+# The PleX claim token is used to connect your server to your account. It can be obtained at
+# https://www.plex.tv/claim/ and is valid for 4 minutes after generating the token.
 PLEX_CLAIM=
 ROOT_DIR=/
diff --git a/README.md b/README.md
index fddbaa6..48b1c49 100644
--- a/README.md
+++ b/README.md
@@ -1,21 +1,26 @@
 # EZARR
-Ezarr is a project built to make it EZ to deploy a Servarr mediacenter, featuring:
-- Sonarr
-- Radarr
-- Lidarr
-- Prowlarr
-- qBittorrent
-- PleX
+Ezarr is a project built to make it EZ to deploy a Servarr mediacenter on an Ubuntu server. It
+features:
+- [Sonarr](https://sonarr.tv/)
+- [Radarr](https://radarr.video/)
+- [Lidarr](https://lidarr.audio/)
+- [Prowlarr](https://wiki.servarr.com/prowlarr)
+- [qBittorrent](https://www.qbittorrent.org/)
+- [PleX](https://www.plex.tv/)
+- [Jellyfin](https://jellyfin.org/)
 
 ## Using
 1. To get started, clone the repository in a directory of your choosing. **Note: this will be where
    your installation and media will be as well, so think about this a bit.**
-2. Copy `.env.sample` to a real `.env`: `$ cp .env.sample .env`.
+2. Copy `.env.sample` to a real `.env` by running `$ cp .env.sample .env`.
 3. Set the environment variables to your liking. Note that `ROOT_DIR` should be the directory you
    have cloned this in.
 4. Run `setup.sh` as superuser. This will set up your users, a system of directories, ensure
    permissions are set correctly and sets some more environment variables for docker compose.
-5. Run `docker compose up`
+5. Take a look at the `docker-compose.yml` file. If there are services you would like to ignore
+   (for example, running PleX and Jellyfin at the same time is a bit unusual), you can comment them
+   out by placing `#` in front of the lines. This ensures they are ignored by Docker compose.
+6. Run `docker compose up`.
 
 That's it! Your containers are now up and you can continue to set up the settings in them. Take
 note of the following:
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c58a73..12a55db 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,14 +7,27 @@ services:
     network_mode: host
     environment:
       - PUID=1000
-      - PGID=1000
+      - PGID=${MEDIACENTER_GID}
       - VERSION=docker
       - PLEX_CLAIM=${PLEX_CLAIM}
     volumes:
       - ${ROOT_DIR}/docker/plex-config:/config
-      - ${ROOT_DIR}/data/media/tv:/tv
-      - ${ROOT_DIR}/data/media/movies:/movies
-      - ${ROOT_DIR}/data/media/music:/music
+      - ${ROOT_DIR}/data/media:/media
+    restart: unless-stopped
+
+  jellyfin:
+    image: lscr.io/linuxserver/jellyfin:latest
+    container_name: jellyfin
+    environment:
+      - PUID=1000
+      - PGID=${MEDIACENTER_GID}
+      - UMASK=002
+      - TZ=Europe/Amsterdam
+    volumes:
+      - ${ROOT_DIR}/docker/jellyfin-config:/config
+      - ${ROOT_DIR}/data/media:/data
+    ports:
+      - 8096:8096
     restart: unless-stopped
 
 #