diff --git a/README.md b/README.md index 1f7248d..fc017de 100644 --- a/README.md +++ b/README.md @@ -17,16 +17,19 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Self hosted streaming media server -**Shipped version:** 1.10.3~ynh2 +**Shipped version:** 1.10.4~ynh1 **Demo:** https://streama.demo-version.net ## Screenshots +![](./doc/screenshots/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg) ![](./doc/screenshots/screenshot.jpg) ## Disclaimers / important information +## Disclaimers / important information + ## Installation guide > :warning: Streama must be installed in the root domain or subdomain. diff --git a/README_fr.md b/README_fr.md index 22a46fc..b423b78 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,12 +13,13 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur de streaming auto-hébergé -**Version incluse :** 1.10.3~ynh2 +**Version incluse :** 1.10.4~ynh1 **Démo :** https://streama.demo-version.net ## Captures d'écran +![](./doc/screenshots/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg) ![](./doc/screenshots/screenshot.jpg) ## Avertissements / informations importantes diff --git a/check_process b/check_process index c11983d..241ec0c 100644 --- a/check_process +++ b/check_process @@ -1,12 +1,8 @@ -# See here for more informations -# https://github.com/YunoHost/package_check#syntax-check_process-file - ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/" (PATH) - is_public=1 (PUBLIC|public=1|private=0) - port="9980" (PORT) + domain="domain.tld" + path="/" + is_public=1 ; Checks pkg_linter=1 setup_sub_dir=1 @@ -18,7 +14,6 @@ upgrade=1 from_commit=3a02114f50e785722bc592cbcc33f92bf070b1c1 backup_restore=1 multi_instance=0 - port_already_use=0 change_url=0 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index b5cad0a..b1ac7e8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/streamaserver/streama/releases/download/v1.10.3/streama-1.10.3.jar -SOURCE_SUM=9d99acb55883e39be3604d5a1e8730c219acf59dfcdfbe8a36fb6ed1cbab615d +SOURCE_URL=https://github.com/streamaserver/streama/releases/download/v1.10.4/streama-1.10.4.jar +SOURCE_SUM=a1071ab783f4d47553ac38a5357b7ce801c8cfe3e523280feead865e23b7da2e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=jar SOURCE_IN_SUBDIR=false diff --git a/conf/nginx.conf b/conf/nginx.conf index 6a029b1..ed31f01 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,10 +1,5 @@ location __PATH__/ { - # Force usage of https - if ($scheme = http) { - rewrite ^ https://$server_name$request_uri? permanent; - } - proxy_pass http://127.0.0.1:__PORT__; proxy_redirect off; proxy_set_header Host $host; diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000..c90376b Binary files /dev/null and b/doc/.DS_Store differ diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 95fbd2c..292fe72 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,3 +1,5 @@ +## Disclaimers / important information + ## Installation guide > :warning: Streama must be installed in the root domain or subdomain. diff --git a/doc/screenshots/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg b/doc/screenshots/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg new file mode 100644 index 0000000..527d42b Binary files /dev/null and b/doc/screenshots/96721577-9f216280-13ac-11eb-935c-d083f4b010a2.jpg differ diff --git a/manifest.json b/manifest.json index e9c6ef9..a616613 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Self hosted streaming media server", "fr": "Serveur de streaming auto-hébergé" }, - "version": "1.10.3~ynh2", + "version": "1.10.4~ynh1", "url": "https://streamaserver.org/", "upstream": { "license": "MIT", @@ -21,7 +21,7 @@ "email": "liberodark@gmail.com" }, "requirements": { - "yunohost": ">= 4.2.4" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -31,8 +31,7 @@ "arguments": { "install": [{ "name": "domain", - "type": "domain", - "example": "streama.example.com" + "type": "domain" }, { "name": "is_public", diff --git a/scripts/restore b/scripts/restore index ea11593..ccc3212 100644 --- a/scripts/restore +++ b/scripts/restore @@ -35,10 +35,7 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=3 -ynh_webpath_available --domain="$domain" --path_url="$path_url" \ - || ynh_die --message="Path not available: ${domain}${path_url}" -test ! -d "$final_path" \ - || ynh_die --message="There is already a directory: $final_path " +test ! -d "$final_path" || ynh_die --message="There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS