diff --git a/check_process b/check_process index fad2e24..5d3f417 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=0bdac48b6ee51cbfd687a1e3a693f105f79185b6 + upgrade=1 from_commit=e163e711145f6dd5674e25ba378c6807d3a4f748 backup_restore=1 multi_instance=0 port_already_use=1 diff --git a/conf/nginx.conf b/conf/nginx.conf index 1b15548..c0399a3 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -13,10 +13,6 @@ location __PATH__/ { proxy_pass http://localhost:__PORT_WEB__/; proxy_set_header Host $host; - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } # Include SSOWAT user panel. include conf.d/yunohost_panel.conf.inc; diff --git a/manifest.json b/manifest.json index 47e24cc..e08796b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.15.0~ynh1", + "version": "10.16.0~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.15.0", + "version": "10.16.0", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", @@ -32,7 +32,6 @@ { "name": "domain", "type": "domain", - "example": "example.com", "help": { "en": "UMS require its own subdomain", "fr": "UMS a besoin de son propre sous-domaine" diff --git a/scripts/_common.sh b/scripts/_common.sh index 16c9386..a70a27a 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,11 +9,11 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=0480572e9cb5c4aae8fddc9cea1402d7e0466a98dab4b19fe32a660a543fbf4d -sha256_armel=fbb7e56abaf3bbf55457d46d5f72843a039b039ffe5a886fce1b91c0f01c6d6e -sha256_armhf=a14163ee429b8762d477d4845859d6bf5a1ff3b77cf64f5fffc65e170e701206 -sha256_x86_64=664c4f006fc66f82aaef67186d4c77b2d2c581c8756c56579397a7a6fc938d2f -sha256_x86=7e7fffe1d3ea345ef9d60a9fdb0cb38978ce8739ebffd8b0b7d799be58cfbc40 +sha256_arm64=9bfbb42c68bf4fcdaaa37ab442bab42a56075b70d9092fbd4062c0f2d75fc570 +sha256_armel=7ac0048d9908afdb66b724dc571b7fbdbfd0cb18d18248a5667ca066ecd1515f +sha256_armhf=70c3b834140816837c102541e3025b01795ff0d530ae82d21e308d2dc140bc08 +sha256_x86_64=dd0aa1347dc223b83b647efc8004752624a187af937f838441fc259dd8d98077 +sha256_x86=c7d948d2245f306f95661808cb279563ac792d68f04b33c54f35c2d47d73ed49 case "$mach" in "armv6l" ) mach="armel"