From 6140ccd7fab29ea349841223a34c82757d65ba48 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 22:34:41 +0200 Subject: [PATCH 1/5] fix linter --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index a259f72..b983196 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,12 +1,13 @@ #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent; location __PATH__/ { + proxy_pass http://127.0.0.1:__PORT____PATH__/; proxy_pass_request_headers on; 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-Host $http_host; + proxy_set_header X-Forwarded-Host $host; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection $http_connection; From 39577a4e5f4600f2ee1af57929feeded94e845da Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 25 Aug 2023 23:36:43 +0200 Subject: [PATCH 2/5] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 41450fc..2a79b34 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Media System that manage and stream your media", "fr": "Système multimédia qui gère et diffuse vos médias" }, - "version": "10.8.10~ynh1", + "version": "10.8.10~ynh2", "url": "https://jellyfin.org", "upstream": { "license": "GPL-2.0-only", From cd89d06d16a726276092ca30f4814cc80df90537 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 25 Aug 2023 21:36:48 +0000 Subject: [PATCH 3/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6b59068..a804bcb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Jellyfin enables you to collect, manage, and stream your media. Run the Jellyfin server on your system and gain access to the leading free-software entertainment system, bells and whistles included. -**Shipped version:** 10.8.10~ynh1 +**Shipped version:** 10.8.10~ynh2 **Demo:** https://demo.jellyfin.org/stable/web/index.html diff --git a/README_fr.md b/README_fr.md index fa14c82..aba76bd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Jellyfin vous permet de collecter, gérer et diffuser vos médias. Exécutez le serveur Jellyfin sur votre système et accédez au principal système de divertissement à logiciel libre. -**Version incluse :** 10.8.10~ynh1 +**Version incluse :** 10.8.10~ynh2 **Démo :** https://demo.jellyfin.org/stable/web/index.html From 3c87018ffd0cf6f4693ef07d7f57349f50c9b785 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 27 Aug 2023 15:08:19 +0200 Subject: [PATCH 4/5] Remove discovery open ports requirement --- scripts/install | 8 +------- scripts/restore | 8 +------- scripts/upgrade | 8 +------- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/scripts/install b/scripts/install index 0b4d6d4..7e62106 100644 --- a/scripts/install +++ b/scripts/install @@ -191,13 +191,7 @@ ynh_use_logrotate #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -# Build the ports list -needed_ports=() -(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) -(( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) - -# Integrate service and require to expose the ports if needed -yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" +yunohost service add $app --description="Jellyfin media center" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 33b28e6..3251837 100644 --- a/scripts/restore +++ b/scripts/restore @@ -164,13 +164,7 @@ ynh_restore_file --origin_path="/etc/logrotate.d/$app" #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -# Build the ports list -needed_ports=() -(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) -(( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) - -# Integrate service and require to expose the ports if needed -yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" +yunohost service add $app --description="Jellyfin media center" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 1f16252..bcb90cd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -215,13 +215,7 @@ ynh_use_logrotate --non-append #================================================= ynh_script_progression --message="Integrating service in YunoHost..." --weight=1 -# Build the ports list -needed_ports=() -(( $discovery_service == 1 )) && needed_ports+=( "$discovery_service_port" ) -(( $discovery_client == 1 )) && needed_ports+=( "$discovery_client_port" ) - -# Integrate service and require to expose the ports if needed -yunohost service add $app --description="Jellyfin media center" ${needed_ports:+--needs_exposed_ports} "${needed_ports[@]}" +yunohost service add $app --description="Jellyfin media center" #================================================= # START SYSTEMD SERVICE From d40c3ecfe5c542258ddeab3ae761dd89e62b65e3 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 27 Aug 2023 15:59:27 +0200 Subject: [PATCH 5/5] Update conf/LDAP-Auth.xml --- conf/LDAP-Auth.xml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/conf/LDAP-Auth.xml b/conf/LDAP-Auth.xml index 713a063..fe730de 100644 --- a/conf/LDAP-Auth.xml +++ b/conf/LDAP-Auth.xml @@ -1,16 +1,26 @@ 127.0.0.1 - ou=users,dc=yunohost,dc=org 389 - uid, mail - uid - (permission=cn=jellyfin.main,ou=permission,dc=yunohost,dc=org) - (permission=cn=jellyfin.admin,ou=permission,dc=yunohost,dc=org) - - - true false false false + + + ou=users,dc=yunohost,dc=org + (permission=cn=jellyfin.main,ou=permission,dc=yunohost,dc=org) + + (permission=cn=jellyfin.admin,ou=permission,dc=yunohost,dc=org) + uid, mail + false + true + false + uid + userPassword + true + + db36da0754ef18efa77eabef2d57a80d + db4c1708cbb5dd1676284a40f2950aba + +