From 27ed0d5684ff49c4d26e0125abd5dc815e156b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 18 Jul 2023 18:36:37 +0200 Subject: [PATCH 1/2] Testing (#83) * Small fixs * Auto-update README * Version 2 (#79) * v2 * Auto-update README * v2 * Auto-update README * fix * Update install * Update systemd.service * fix * fix * fix * fix * Update manifest.toml * cleaning * Update config_panel.toml --------- Co-authored-by: yunohost-bot * Delete check_process * Update manifest.toml * Update tests.toml * fix(upgrade): missing use_ldap in upgrade (#82) * fix(upgrade): missing use_ldap loading in upgrade * style: tabs * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot Co-authored-by: Hugo Poissonnet --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 4 ++-- scripts/upgrade | 9 +++++++++ tests.toml | 6 ++++++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e120027..69ab852 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The administrator of the Lufi instance you use will not be able to see what is i The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reach the server. :-) -**Shipped version:** 0.05.21~ynh1 +**Shipped version:** 0.05.21~ynh2 **Demo:** https://demo.lufi.io/ diff --git a/README_fr.md b/README_fr.md index cee8afb..38d6fc1 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,7 @@ The administrator of the Lufi instance you use will not be able to see what is i The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https://en.wikipedia.org/wiki/Fragment_identifier)), that means this part is only processed client-side and does not reach the server. :-) -**Version incluse :** 0.05.21~ynh1 +**Version incluse :** 0.05.21~ynh2 **Démo :** https://demo.lufi.io/ diff --git a/manifest.toml b/manifest.toml index 891e6d7..8f5cf4f 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Lufi" description.en = "Files and sharing anonymous application" description.fr = "Application de partage de fichiers anonyme" -version = "0.05.21~ynh1" +version = "0.05.21~ynh2" maintainers = ["frju365, cyp"] @@ -17,7 +17,7 @@ code = "https://framagit.org/fiat-tux/hat-softwares/lufi" website = "https://git.framasoft.org/luc/lufi" [integration] -yunohost = ">= 11.1.17" +yunohost = ">= 11.1.21" architectures = "all" multi_instance = true ldap = true diff --git a/scripts/upgrade b/scripts/upgrade index 707a138..356fb96 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,6 +34,15 @@ if [ -z "${max_file_size:-}" ]; then ynh_app_setting_set --app=$app --key=max_file_size --value=$max_file_size fi +if [ -z "${use_ldap:-}" ]; then + use_ldap=0 + ynh_app_setting_set --app=$app --key=use_ldap --value=$use_ldap +fi + +if [ -z "${secret:-}" ]; then + secret=$(ynh_string_random --length=24) + ynh_app_setting_set --app=$app --key=secret --value=$secret +fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= diff --git a/tests.toml b/tests.toml index addbc4d..029d43a 100644 --- a/tests.toml +++ b/tests.toml @@ -7,3 +7,9 @@ test_format = 1.0 # ------------------------------- args.use_ldap=0 + + # ------------------------------- + # Commits to test upgrade from + # ------------------------------- + + test_upgrade_from.4311a7ac2df01a866bd50a83fbdb95b9c1c154ef.name = "Upgrade from 0.05.21~ynh1" From b3a8913241d4ac6ae1e7bfc54c789c77e099956e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:20:58 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 69ab852..77332a1 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https: * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 38d6fc1..9ee3cc2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ The encryption key part of the URL is a anchor (Cf. [Fragment Identifier](https: * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs