From 464918e6dec89e379c37d134ed3894b201f4be43 Mon Sep 17 00:00:00 2001 From: Josue-T Date: Mon, 27 Feb 2017 08:20:54 +0100 Subject: [PATCH 1/2] Update_riot (#2) * Add check_process * Add link to chattroom --- README.md | 2 ++ check_process | 2 +- scripts/_common.sh | 4 ---- scripts/install | 5 ++++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 0d44247..4481f93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ Riot For yunohost ================== +Yunohost chattroom with matrix : [https://riot.im/app/#/room/#yunohost:matrix.org](https://riot.im/app/#/room/#yunohost:matrix.org) + [Yunohost project](https://yunohost.org/#/) It's a webclient for matrix. For a matrix server you can install synapse on your server : https://github.com/YunoHost-Apps/synapse_ynh diff --git a/check_process b/check_process index 4c72c2d..5b48a55 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,7 @@ upgrade=1 backup_restore=0 multi_instance=1 - wrong_user=1 + wrong_user=0 wrong_path=1 incorrect_path=1 corrupt_source=1 diff --git a/scripts/_common.sh b/scripts/_common.sh index 71d2919..01a265f 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -65,10 +65,6 @@ CHECK_PATH () { # Vérifie la présence du / en début de path. Et son absence fi } -CHECK_DOMAINPATH () { # Vérifie la disponibilité du path et du domaine. - sudo yunohost app checkurl $domain$path -a $app -} - CHECK_FINALPATH () { # Vérifie que le dossier de destination n'est pas déjà utilisé. final_path=/var/www/$app if [ -e "$final_path" ] diff --git a/scripts/install b/scripts/install index 705058b..75dea2a 100644 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,12 @@ is_public=$YNH_APP_ARG_IS_PUBLIC default_home_server=$YNH_APP_ARG_DEFAULT_HOME_SERVER CHECK_PATH # Vérifie et corrige la syntaxe du path. -CHECK_DOMAINPATH # Vérifie la disponibilité du path et du domaine. CHECK_FINALPATH # Vérifie que le dossier de destination n'est pas déjà utilisé. +# Check domain/path availability +sudo yunohost app checkurl "${domain}${path}" -a "$app" \ + || ynh_die "Path not available: ${domain}${path}" + # Enregistre les infos dans la config YunoHost ynh_app_setting_set $app domain $domain ynh_app_setting_set $app path $path From 566179d3f5d303646c1fc010a348908a9000fdf5 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 17 Mar 2017 20:12:47 +0100 Subject: [PATCH 2/2] Fix check_process (#3) --- check_process | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_process b/check_process index 5b48a55..71eece3 100644 --- a/check_process +++ b/check_process @@ -3,7 +3,7 @@ # Commentaire ignoré ; Manifest domain="$DOMAIN" (DOMAIN) - path="$PATH" (PATH) + path="/path" (PATH) default_home_server="matrix.org" is_public=1 (PUBLIC|public=1|private=0) ; Checks @@ -33,4 +33,4 @@ Level 7=auto Level 8=0 Level 9=0 - Level 10=0 \ No newline at end of file + Level 10=0