diff --git a/README.md b/README.md index f109e56..dabab87 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Jellyfin for YunoHost [![Integration level](https://dash.yunohost.org/integration/jellyfin.svg)](https://dash.yunohost.org/appci/app/jellyfin) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/jellyfin.maintain.svg) -[![Install Jellyfin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=jellyfin) +[![Install Jellyfin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jellyfin) -> *This package allows you to install REPLACEBYYOURAPP quickly and simply on a YunoHost server. +> *This package allows you to install Jellyfin quickly and simply on a YunoHost server. If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* ## Overview diff --git a/check_process b/check_process index 9263eba..19f6216 100644 --- a/check_process +++ b/check_process @@ -23,13 +23,8 @@ upgrade=1 from_commit=3e38d2ec954f6b333c3c2ed95e0e75c0df2fe966 backup_restore=1 multi_instance=0 - # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. - # incorrect_path=1 port_already_use=0 change_url=1 -;;; Levels - # If the level 5 (Package linter) is forced to 1. Please add justifications here. - Level 5=auto ;;; Options Email= Notification=none diff --git a/conf/nginx.conf b/conf/nginx.conf index b1f2ab0..0e7dfc1 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -6,6 +6,7 @@ location __PATH__/ { rewrite ^ https://$server_name$request_uri? permanent; } + # Proxy main Jellyfin traffic proxy_pass http://127.0.0.1:__PORT____PATH__/; proxy_pass_request_headers on; proxy_set_header Host $host; @@ -16,6 +17,23 @@ location __PATH__/ { proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; + # Disable buffering when the nginx proxy gets very resource heavy upon streaming + proxy_buffering off; + # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; } + +location __PATH__/socket { + # Proxy Jellyfin Websockets traffic + proxy_pass http://127.0.0.1:__PORT____PATH__/; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Protocol $scheme; + proxy_set_header X-Forwarded-Host $http_host; +} diff --git a/scripts/install b/scripts/install index 96d1be9..01d9921 100644 --- a/scripts/install +++ b/scripts/install @@ -58,7 +58,7 @@ ynh_app_setting_set --app=$app --key=is_public --value=$is_public #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." --weight=1 +ynh_script_progression --message="Finding an available port..." --weight=1 # Find an available port port=$(ynh_find_port --port=8095) @@ -93,7 +93,7 @@ ynh_system_user_create --username=$app ynh_script_progression --message="Configuring the settings..." --weight=1 # Load services once to generate system.xml -systemctl enable jellyfin +systemctl enable jellyfin --quiet systemctl start jellyfin sleep 5 systemctl stop jellyfin @@ -139,7 +139,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Jellyfin media center" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Jellyfin media center" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 9f061d1..0339296 100644 --- a/scripts/restore +++ b/scripts/restore @@ -93,14 +93,14 @@ ynh_script_progression --message="Restoring the systemd configuration..." --weig ynh_restore_file --origin_path="/lib/systemd/system/jellyfin.service" 2>/dev/null ynh_restore_file --origin_path="/etc/systemd/system/jellyfin.service.d" 2>/dev/null -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Jellyfin media center" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Jellyfin media center" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 86cebe0..cbbc124 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,7 +120,7 @@ fi #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -yunohost service add $app --description "Jellyfin media center" --log "/var/log/$app/$app.log" +yunohost service add $app --description="Jellyfin media center" --log="/var/log/$app/$app.log" #================================================= # START SYSTEMD SERVICE