From d8a9b23e1ea3992fcbd2558eb5c6db9b7213eb6a Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 23 Oct 2020 15:21:23 +0200 Subject: [PATCH] Small fixes --- README.md | 6 ++---- README_fr.md | 8 +++----- check_process | 6 ++---- scripts/install | 4 +--- scripts/restore | 2 +- scripts/upgrade | 2 +- 6 files changed, 10 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index c589ab5..f4eb85a 100644 --- a/README.md +++ b/README.md @@ -43,13 +43,11 @@ Default local video directory is: `/home/yunohost.app/streama/upload` (must be m #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logsSTREAMA%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/STREAMA%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/streama%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/streama%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/) ## Limitations -* Installation requires a dedicated domain or subdomain. - ## Additional information * After install: diff --git a/README_fr.md b/README_fr.md index 50bd162..20d72da 100644 --- a/README_fr.md +++ b/README_fr.md @@ -26,7 +26,7 @@ Streama est un serveur de streaming multimédia auto-hébergé gratuit fonctionn ## Guide d’installation -> :warning: Streama doit être installé dans le domaine racine ou sous-domaine. +> :warning: Streama doit être installé dans le domaine racine ou un sous-domaine dédié. Le répertoire de téléchargement par défaut est : `/home/yunohost.app/streama` (doit être mentionné dans la page *Paramètres* ou peut être modifié) @@ -43,13 +43,11 @@ Le répertoire vidéo local par défaut est : `/home/yunohost.app/streama/upload #### Architectures supportées -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logsSTREAMA%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/STREAMA%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/streama%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/streama/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/streama%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/streama/) ## Limitations -* L’installation nécessite un domaine ou un sous-domaine dédié. - ## Informations additionnelles * Après l’installation : diff --git a/check_process b/check_process index 7f7c0a5..32018f8 100644 --- a/check_process +++ b/check_process @@ -6,10 +6,8 @@ ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) - path="/" (PATH) - is_public=1 (PUBLIC|public=1|private=0) -# password="pass" -# nextclouddomain="domain.tld" + path="/" (PATH) + is_public=1 (PUBLIC|public=1|private=0) port="9980" (PORT) ; Checks pkg_linter=1 diff --git a/scripts/install b/scripts/install index 579281b..0a8dadc 100644 --- a/scripts/install +++ b/scripts/install @@ -58,8 +58,6 @@ ynh_script_progression --message="Configuring firewall..." --weight=3 port=$(ynh_find_port --port=8095) ynh_app_setting_set --app=$app --key=port --value=$port -ynh_app_setting_set --app=$app --key=port --value=$port - #================================================= # INSTALL DEPENDENCIES #================================================= @@ -135,7 +133,7 @@ yunohost service add $app --description "Streama media system" --log "/var/log/$ ynh_script_progression --message="Starting a systemd service..." --weight=2 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Grails application running at" #--timeout="60" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Grails application running at" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index 2e6a73b..576084e 100644 --- a/scripts/restore +++ b/scripts/restore @@ -84,7 +84,7 @@ yunohost service add "$app" --description "Streama media system" --log "/var/log #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name="$app" --action="start" --log_path="/systemd" --line_match="Grails application running at" #--timeout="60" +ynh_systemd_action --service_name="$app" --action="start" --log_path="/systemd" --line_match="Grails application running at" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 089adcd..10b821b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -113,7 +113,7 @@ yunohost service add $app --description "Streama media system" --log "/var/log/$ ynh_script_progression --message="Starting a systemd service..." --weight=5 # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Grails application running at" #--timeout="60" +ynh_systemd_action --service_name=$app --action="start" --log_path="systemd" --line_match="Grails application running at" #================================================= # RELOAD NGINX