From 3ba30c03777086370f0a4f3d00a511d190611956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Sat, 18 Feb 2017 11:31:40 +0100 Subject: [PATCH 1/3] Add check_process --- check_process | 63 +++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/check_process b/check_process index c774682..4c72c2d 100644 --- a/check_process +++ b/check_process @@ -1,27 +1,36 @@ -;; Test complet - auto_remove=1 - ; Manifest - domain="domain.tld" (DOMAIN) - path="/path" (PATH) - admin="john" (USER) - language="fr" - is_public="Yes" (PUBLIC|public=Yes|private=No) - password="pass" (PASSWORD) - port="666" (PORT) - ; Checks - pkg_linter=1 - setup_sub_dir=1 - setup_root=1 - setup_nourl=0 - setup_private=1 - setup_public=1 - upgrade=1 - backup_restore=1 - multi_instance=1 - wrong_user=1 - wrong_path=1 - incorrect_path=1 - corrupt_source=0 - fail_download_source=0 - port_already_use=1 - final_path_already_use=0 +;; General + auto_remove=1 +# Commentaire ignoré + ; Manifest + domain="$DOMAIN" (DOMAIN) + path="$PATH" (PATH) + default_home_server="matrix.org" + is_public=1 (PUBLIC|public=1|private=0) + ; Checks + pkg_linter=1 + setup_sub_dir=1 + setup_root=1 + setup_nourl=0 + setup_private=1 + setup_public=1 + upgrade=1 + backup_restore=0 + multi_instance=1 + wrong_user=1 + wrong_path=1 + incorrect_path=1 + corrupt_source=1 + fail_download_source=1 + port_already_use=0 (XXXX) + final_path_already_use=1 +;;; Levels + Level 1=auto + Level 2=auto + Level 3=auto + Level 4=0 + Level 5=auto + Level 6=auto + Level 7=auto + Level 8=0 + Level 9=0 + Level 10=0 \ No newline at end of file From 352fbc68172421f9228149c5546adcbd5066e5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Mon, 27 Feb 2017 08:11:16 +0100 Subject: [PATCH 2/3] 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 1af9bf8c2755264d9a8c31db1a7d6cd8efd37372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josu=C3=A9=20Tille?= Date: Fri, 14 Apr 2017 11:49:12 +0200 Subject: [PATCH 3/3] Update Riot to 0.9.8 --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 01a265f..c363f47 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -1,8 +1,8 @@ #!/bin/bash ## Adapt md5sum while you update app -md5sum="9207037616522dd12ba5c2425eb05331" -verctor_version="0.9.7" +md5sum="39199c537bf8072a3c272abe0372dc3e" +verctor_version="0.9.8" init_script() { # Exit on command errors and treat unset variables as an error