From b7c6c693031b28a92b3df2afad0a7aae68df49c1 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 11:40:34 -0300 Subject: First iteration of jellyfin and plex --- docker-compose.example.yaml | 21 +++++++++++---------- install.sh | 31 ++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 11 deletions(-) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index b0b025b..3a88959 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -1,24 +1,25 @@ version: "3" services: - # Emby is used to serve your media to the client devices - emby: - image: ghcr.io/linuxserver/emby - container_name: emby + # is used to serve your media to the client devices + : + image: lscr.io/linuxserver/ + container_name: environment: - PUID= - PGID= + - VERSION=docker volumes: - /movies:/data/movies - /tvshows:/data/tvshows - - /config/emby:/config + - /config/:/config ports: - - 8096:8096 + - : restart: unless-stopped # qBitorrent is used to download torrents qbittorrent: - image: ghcr.io/linuxserver/qbittorrent + image: lscr.io/linuxserver/qbittorrent container_name: qbittorrent environment: - PUID= @@ -34,7 +35,7 @@ services: # Sonarr is used to query, add downloads to the download queue and index TV shows sonarr: - image: ghcr.io/linuxserver/sonarr + image: lscr.io/linuxserver/sonarr container_name: sonarr environment: - PUID= @@ -49,7 +50,7 @@ services: # Radarr is used to query, add downloads to the download queue and index Movies radarr: - image: ghcr.io/linuxserver/radarr + image: lscr.io/linuxserver/radarr container_name: radarr environment: - PUID= @@ -64,7 +65,7 @@ services: # Bazarr is used to download and categorize subtitles bazarr: - image: ghcr.io/linuxserver/bazarr + image: lscr.io/linuxserver/bazarr container_name: bazarr environment: - PUID= diff --git a/install.sh b/install.sh index d50a684..687a60c 100755 --- a/install.sh +++ b/install.sh @@ -57,7 +57,7 @@ running_services_location() { echo "Sonarr: http://$host_ip:8989/" echo "Prowlarr: http://$host_ip:9696/" echo "Bazarr: http://$host_ip:6767/" - echo "Emby: http://$host_ip:8096/" + echo "$media_service: http://$host_ip:$media_service_port/" } # ============================================================================================ @@ -110,6 +110,31 @@ if [ $media_folder_correct == "n" ]; then send_error_message "Media folder is not correct. Please, fix it and run the script again" fi +# Setting the preferred media service +echo +echo +echo +echo "Time to choose your media service." +echo "Your media service is the one responsible for serving your files to your network." +echo "By default, YAMS support 3 media services:" +echo "- emby (Recommended)" +echo "- jellyfin" +echo "- plex" +read -p "Choose your media service [emby]: " media_service +media_service=${media_service:-"emby"} +media_service=$(echo "$media_service" | sed -e 's/\(.*\)/\L\1/') + +media_service_port=8096 +if [ "$media_service" == "plex" ]; then + media_service_port=32400 +fi + +if echo "emby plex jellyfin" | grep -qw "$media_service"; then + echo "YAMS is going to install \"$media_service\" on port \"$media_service_port\"" +else + send_error_message "\"$media_service\" is not supported by YAMS. Are you sure you chose the correct service?" +fi + # Adding the VPN echo echo @@ -180,6 +205,10 @@ sed -i -e "s//$pgid/g" $filename # Set media_folder sed -i -e "s;;$media_folder;g" $filename +# Set media_service +sed -i -e "s;;$media_service;g" $filename +sed -i -e "s;;$media_service_port;g" $filename + # Set config folder sed -i -e "s;;$install_location;g" $filename -- cgit v1.2.3 From 796d3066de66e727fc3666e418296c8299fd0d9d Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 11:45:24 -0300 Subject: Added watchtower --- docker-compose.example.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index 3a88959..c766a82 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -113,3 +113,9 @@ services: - OPENVPN_USER= - OPENVPN_PASSWORD= - SERVER_COUNTRIES= + + # Watchtower is going to keep our instances updated + watchtower: + image: containrrr/watchtower + volumes: + - /var/run/docker.sock:/var/run/docker.sock -- cgit v1.2.3 From 3a825419abac9da9e6d9d6626cc0a97d5aaa345c Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 11:58:11 -0300 Subject: Changed default media server to jellyfin --- docker-compose.example.yaml | 1 + install.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index c766a82..f85a9c1 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -117,5 +117,6 @@ services: # Watchtower is going to keep our instances updated watchtower: image: containrrr/watchtower + container_name: watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock diff --git a/install.sh b/install.sh index 687a60c..1a333b4 100755 --- a/install.sh +++ b/install.sh @@ -117,11 +117,11 @@ echo echo "Time to choose your media service." echo "Your media service is the one responsible for serving your files to your network." echo "By default, YAMS support 3 media services:" -echo "- emby (Recommended)" -echo "- jellyfin" +echo "- jellyfin (recommended)" +echo "- emby" echo "- plex" -read -p "Choose your media service [emby]: " media_service -media_service=${media_service:-"emby"} +read -p "Choose your media service [jellyfin]: " media_service +media_service=${media_service:-"jellyfin"} media_service=$(echo "$media_service" | sed -e 's/\(.*\)/\L\1/') media_service_port=8096 -- cgit v1.2.3 From 93c699045e4af4f8ec5d8f078f51139e5e10e7bb Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 16:02:27 -0300 Subject: Added extra settings for Plex --- docker-compose.example.yaml | 5 +++-- install.sh | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index f85a9c1..6af3b0b 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -5,6 +5,7 @@ services: : image: lscr.io/linuxserver/ container_name: + #network_mode: host # plex environment: - PUID= - PGID= @@ -14,7 +15,7 @@ services: - /tvshows:/data/tvshows - /config/:/config ports: - - : + - 8096:8096 restart: unless-stopped # qBitorrent is used to download torrents @@ -81,7 +82,7 @@ services: # Prowlarr is our torrent indexer/searcher. Sonarr/Radarr use Prowlarr as a # source prowlarr: - image: lscr.io/linuxserver/prowlarr:latest + image: lscr.io/linuxserver/prowlarr container_name: prowlarr environment: - PUID= diff --git a/install.sh b/install.sh index 1a333b4..0551d3f 100755 --- a/install.sh +++ b/install.sh @@ -207,7 +207,9 @@ sed -i -e "s;;$media_folder;g" $filename # Set media_service sed -i -e "s;;$media_service;g" $filename -sed -i -e "s;;$media_service_port;g" $filename +if [ $media_service == "plex" ]; then + sed -i -e "s;#network_mode: host # plex;network_mode: host # plex;g" $filename +fi # Set config folder sed -i -e "s;;$install_location;g" $filename -- cgit v1.2.3 From 4ab8e2424121843e4ea52e50f82f05f36e06385e Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 16:11:08 -0300 Subject: Added warnings to Plex --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 0551d3f..3272414 100755 --- a/install.sh +++ b/install.sh @@ -117,9 +117,9 @@ echo echo "Time to choose your media service." echo "Your media service is the one responsible for serving your files to your network." echo "By default, YAMS support 3 media services:" -echo "- jellyfin (recommended)" +echo "- jellyfin (recommended, easier, with the most functionalities)" echo "- emby" -echo "- plex" +echo "- plex (advanced)" read -p "Choose your media service [jellyfin]: " media_service media_service=${media_service:-"jellyfin"} media_service=$(echo "$media_service" | sed -e 's/\(.*\)/\L\1/') -- cgit v1.2.3 From 0805e87b10485045229c6424ddbb4901a1b9be5d Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 16:13:34 -0300 Subject: Added more warnings to plex --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 3272414..8b8c302 100755 --- a/install.sh +++ b/install.sh @@ -119,7 +119,7 @@ echo "Your media service is the one responsible for serving your files to your n echo "By default, YAMS support 3 media services:" echo "- jellyfin (recommended, easier, with the most functionalities)" echo "- emby" -echo "- plex (advanced)" +echo "- plex (advanced, always online, slower)" read -p "Choose your media service [jellyfin]: " media_service media_service=${media_service:-"jellyfin"} media_service=$(echo "$media_service" | sed -e 's/\(.*\)/\L\1/') -- cgit v1.2.3 From b3493b55e46913138cddc4033ca4e13171611f07 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 16:20:32 -0300 Subject: Fixed typo --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8b8c302..bbe3516 100755 --- a/install.sh +++ b/install.sh @@ -117,7 +117,7 @@ echo echo "Time to choose your media service." echo "Your media service is the one responsible for serving your files to your network." echo "By default, YAMS support 3 media services:" -echo "- jellyfin (recommended, easier, with the most functionalities)" +echo "- jellyfin (recommended, easier)" echo "- emby" echo "- plex (advanced, always online, slower)" read -p "Choose your media service [jellyfin]: " media_service -- cgit v1.2.3 From ca34d489ebd27868e948b97345a5cc7cdb0bc50c Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 16:32:06 -0300 Subject: Changed base config --- base/base-config.tar.gz | Bin 2350317 -> 6211481 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/base-config.tar.gz b/base/base-config.tar.gz index 8ec5f45..5ffafdd 100644 Binary files a/base/base-config.tar.gz and b/base/base-config.tar.gz differ -- cgit v1.2.3 From bd21f336041d06797e24b402d8f1b93971a9e734 Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 17:02:20 -0300 Subject: Updated base config --- base/base-config.tar.gz | Bin 6211481 -> 22104386 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/base/base-config.tar.gz b/base/base-config.tar.gz index 5ffafdd..7eb8e61 100644 Binary files a/base/base-config.tar.gz and b/base/base-config.tar.gz differ -- cgit v1.2.3 From 6cdb6e3928eeb9479f7376d4fe031543b7f4c94a Mon Sep 17 00:00:00 2001 From: Roger Gonzalez Date: Mon, 23 Jan 2023 17:17:12 -0300 Subject: Updated README --- README.org | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/README.org b/README.org index 8e96df2..d391665 100644 --- a/README.org +++ b/README.org @@ -13,7 +13,9 @@ Website: [[https://yams.media][https://yams.media]] This script installs the following software: - [[https://sonarr.tv/][Sonarr]] - [[https://radarr.video/][Radarr]] +- [[https://jellyfin.org/][Jellyfin]] - [[https://emby.media/][Emby]] +- [[https://www.plex.tv/][Plex]] - [[https://www.qbittorrent.org/][qBittorrent]] - [[https://www.bazarr.media/][Bazarr]] - [[https://github.com/Prowlarr/Prowlarr][Prowlarr]] @@ -120,7 +122,9 @@ They are the ones doing the real work, I just created a docker-compose file and - [[https://www.linuxserver.io/donate][linuxserver.io donations page]] - [[https://sonarr.tv/donate][Sonarr donations page]] - [[https://radarr.video/donate][Radarr donations page]] +- [[https://opencollective.com/jellyfin][Jellyfin donations page]] - [[https://emby.media/premiere.html][Emby premier page]] (Recommended! I personally use this service) +- [[https://www.plex.tv/plex-pass/][Plex pass page]] - [[https://www.qbittorrent.org/donate][qBittorrent donations page]] - [[https://www.paypal.com/donate/?cmd=_s-xclick&hosted_button_id=XHHRWXT9YB7WE&source=url][Bazarr donations page]] - [[https://www.paypal.me/qmcgaw][gluetun donations page]] @@ -128,23 +132,23 @@ They are the ones doing the real work, I just created a docker-compose file and Just let them know YAMS sent you there 😎 -* todo +* todo [1/11] :PROPERTIES: :ID: eba4712e-fa8a-42c8-bc32-b593141c99a4 :END: (not in order) -- Support for multiple media servers (Jellyfin and Plex). [Working on it ✅] -- Readd Jackett as advanced settings. -- Support for Wireguard. -- Support for qBittorrent themes (VueTorrent). -- Check [[https://filebrowser.org/][Filebrowser]]. -- Investigate [[https://github.com/FlareSolverr/FlareSolverr][FlareSolverr]]. -- Check [[https://github.com/Unpackerr/unpackerr][unpackerr]]. -- Check [[https://github.com/Flemmarr/Flemmarr][Flemarr]]. -- Add a dashboard like [[https://docs.organizr.app/installation/installing-organizr][Organizr]]. -- Add [[https://www.portainer.io/][Portainer]]. -- Check usenet. +- [X] Support for multiple media servers (Jellyfin and Plex). +- [ ] Readd Jackett as advanced settings. +- [ ] Support for Wireguard. +- [ ] Support for qBittorrent themes (VueTorrent). +- [ ] Check [[https://filebrowser.org/][Filebrowser]]. +- [ ] Investigate [[https://github.com/FlareSolverr/FlareSolverr][FlareSolverr]]. +- [ ] Check [[https://github.com/Unpackerr/unpackerr][unpackerr]]. +- [ ] Check [[https://github.com/Flemmarr/Flemmarr][Flemarr]]. +- [ ] Add a dashboard like [[https://docs.organizr.app/installation/installing-organizr][Organizr]]. +- [ ] Add [[https://www.portainer.io/][Portainer]]. +- [ ] Check usenet. * Special thanks :PROPERTIES: @@ -153,7 +157,9 @@ Just let them know YAMS sent you there 😎 - [[https://info.linuxserver.io/][linuxserver.io]] for their amazing docker images - [[https://sonarr.tv/][Sonarr]] - [[https://radarr.video/][Radarr]] +- [[https://jellyfin.org/][Jellyfin]] - [[https://emby.media/][Emby]] +- [[https://www.plex.tv/][Plex]] - [[https://www.qbittorrent.org/][qBittorrent]] - [[https://www.bazarr.media/][Bazarr]] - [[https://github.com/Prowlarr/Prowlarr][Prowlarr]] -- cgit v1.2.3