From 495c049036a0e7be55b29406beabf5f66c43cc24 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Tue, 6 Jun 2023 20:53:53 +0200 Subject: [PATCH 01/14] [FIX] Fix ADMIN.md message and preset the default database storage folder --- doc/ADMIN.md | 3 ++- scripts/install | 9 ++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 34a2854..0a46827 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -2,4 +2,5 @@ To ease the install process and first access, Tiki saves your uploaded files (office documents, images, pdf, etc. attached to wiki pages, forum posts, tracker items, file galleries...) by default in its database. This works perfectly in most cases but it is not the recommended setup if you need to save many thousands of files or more. -In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use this preset path directory: `/home/yunohost.app/$app`. You will be able to migrate your currently uploaded files from one to the other. +In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use the preset path directory: `/home/yunohost.app/tiki<…>`. You will be able to migrate your currently uploaded files from one to the other. + diff --git a/scripts/install b/scripts/install index 0b3d841..d281e15 100755 --- a/scripts/install +++ b/scripts/install @@ -71,6 +71,10 @@ exec_as_app console.php database:configure "$app" "$db_pwd" "$app" # Create database contents exec_as_app console.php database:install +# Set default database directory +FGALDIR=/home/yunohost.app/$app +exec_as_app sed -i -e "s#storage\/fgal#$FGALDIR#" lib/prefs/fgal.php + # Lock installer exec_as_app console.php installer:lock @@ -78,7 +82,10 @@ exec_as_app console.php installer:lock exec_as_app console.php index:rebuild # Set on Long Term Support versions -exec_as_app console.php preferences:set tiki_release_cycle longterm +if [[ "$release_cycle" == "longterm" ]] +then + exec_as_app console.php preferences:set tiki_release_cycle longterm +fi #================================================= # END OF SCRIPT From e1800bb729734ec5d7e9f56255e071cf667ad010 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Tue, 6 Jun 2023 21:17:10 +0200 Subject: [PATCH 02/14] [FIX] Fix bug in using sed in install script --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d281e15..03dcfe7 100755 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ exec_as_app console.php database:install # Set default database directory FGALDIR=/home/yunohost.app/$app -exec_as_app sed -i -e "s#storage\/fgal#$FGALDIR#" lib/prefs/fgal.php +sed -i -e "s#storage\/fgal#$FGALDIR#" lib/prefs/fgal.php # Lock installer exec_as_app console.php installer:lock From 93d2daac6aa8f5cd5c4ad3fad2ca2ca6a100d40d Mon Sep 17 00:00:00 2001 From: Jyhem Date: Tue, 6 Jun 2023 21:31:30 +0200 Subject: [PATCH 03/14] [FIX] Fix bug in using sed in install script 2 --- scripts/install | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install b/scripts/install index 03dcfe7..2cc6552 100755 --- a/scripts/install +++ b/scripts/install @@ -73,6 +73,7 @@ exec_as_app console.php database:install # Set default database directory FGALDIR=/home/yunohost.app/$app +cd "$install_dir" sed -i -e "s#storage\/fgal#$FGALDIR#" lib/prefs/fgal.php # Lock installer From 1a1a3d208956f252748e31733732fa105ae37130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 9 Jun 2023 10:32:05 +0200 Subject: [PATCH 04/14] Add fr --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 doc/ADMIN_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 34a2854..152170e 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -2,4 +2,4 @@ To ease the install process and first access, Tiki saves your uploaded files (office documents, images, pdf, etc. attached to wiki pages, forum posts, tracker items, file galleries...) by default in its database. This works perfectly in most cases but it is not the recommended setup if you need to save many thousands of files or more. -In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use this preset path directory: `/home/yunohost.app/$app`. You will be able to migrate your currently uploaded files from one to the other. +In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use this preset path directory: `__DATA_DIR__`. You will be able to migrate your currently uploaded files from one to the other. diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md new file mode 100644 index 0000000..23d486c --- /dev/null +++ b/doc/ADMIN_fr.md @@ -0,0 +1,5 @@ +### Stockage de vos fichiers téléchargés + +Pour faciliter le processus d'installation et le premier accès, Tiki enregistre par défaut dans sa base de données vos fichiers téléchargés (documents bureautiques, images, pdf, etc. attachés à des pages wiki, des messages de forum, des éléments de suivi, des galeries de fichiers...) Cela fonctionne parfaitement dans la plupart des cas, mais ce n'est pas la configuration recommandée si vous devez enregistrer plusieurs milliers de fichiers ou plus. + +Dans ce cas, envisagez de passer de "Store to database" à "Store to directory", que vous trouverez dans l'assistant de configuration. Veuillez utiliser ce répertoire de chemin prédéfini : `__DATA_DIR__`. Vous pourrez migrer vos fichiers actuellement téléchargés de l'un à l'autre. From f46e500b1998f220c613738b0edcecccf43fa81b Mon Sep 17 00:00:00 2001 From: tiki-jyhem Date: Fri, 9 Jun 2023 22:22:36 +0200 Subject: [PATCH 05/14] Update doc/ADMIN.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 0a46827..7a8a5f3 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -2,5 +2,5 @@ To ease the install process and first access, Tiki saves your uploaded files (office documents, images, pdf, etc. attached to wiki pages, forum posts, tracker items, file galleries...) by default in its database. This works perfectly in most cases but it is not the recommended setup if you need to save many thousands of files or more. -In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use the preset path directory: `/home/yunohost.app/tiki<…>`. You will be able to migrate your currently uploaded files from one to the other. +In that case, consider switching from "Store to database" to "Store to directory", which you will find in the Configuration Wizard. Please use the preset path directory: `__DATA_DIR__`. You will be able to migrate your currently uploaded files from one to the other. From 084e1bf79ffbbea21ae5c4e8d1d4c062861ce1f0 Mon Sep 17 00:00:00 2001 From: tiki-jyhem Date: Fri, 9 Jun 2023 22:32:17 +0200 Subject: [PATCH 06/14] Update scripts/install Co-authored-by: Alexandre Aubin --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 2cc6552..d395a84 100755 --- a/scripts/install +++ b/scripts/install @@ -72,10 +72,8 @@ exec_as_app console.php database:configure "$app" "$db_pwd" "$app" exec_as_app console.php database:install # Set default database directory -FGALDIR=/home/yunohost.app/$app cd "$install_dir" -sed -i -e "s#storage\/fgal#$FGALDIR#" lib/prefs/fgal.php - +sed -i -e "s#storage\/fgal#$data_dir#" lib/prefs/fgal.php # Lock installer exec_as_app console.php installer:lock From e209e558d14a6a21cbbf9916f54351a3f0974271 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Fri, 9 Jun 2023 22:34:03 +0200 Subject: [PATCH 07/14] [ENH] This \ was useless --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d395a84..e179a35 100755 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ exec_as_app console.php database:install # Set default database directory cd "$install_dir" -sed -i -e "s#storage\/fgal#$data_dir#" lib/prefs/fgal.php +sed -i -e "s#storage/fgal#$data_dir#" lib/prefs/fgal.php # Lock installer exec_as_app console.php installer:lock From 7b7a682b6768770dd9b3f4c534278da19a50e051 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Fri, 9 Jun 2023 23:03:02 +0200 Subject: [PATCH 08/14] [KIL] Remove unused local.php file --- conf/local.php | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 conf/local.php diff --git a/conf/local.php b/conf/local.php deleted file mode 100644 index f9685a1..0000000 --- a/conf/local.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Fri, 23 Jun 2023 17:16:08 +0200 Subject: [PATCH 09/14] [FIX] Don't fail when new variable is unset --- scripts/upgrade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index fd2b539..c8f39f4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,6 +38,12 @@ if [ -z "${fpm_usage:-}" ]; then ynh_app_setting_set --app=$app --key=fpm_usage --value=$fpm_usage fi +# If release_cycle doesn't exist, create it +if [ -z "${release_cycle:-}" ]; then + release_cycle=longterm + ynh_app_setting_set --app=$app --key=release_cycle --value=$release_cycle +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From ed06a9fc9766b562ad2e61bae5558cf12e0db646 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Sat, 24 Jun 2023 00:57:17 +0200 Subject: [PATCH 10/14] [FIX] Update database on updates --- scripts/upgrade | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index c8f39f4..f8f9e88 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -65,6 +65,9 @@ fi chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +# Update database +exec_as_app console.php database:update + #================================================= # NGINX CONFIGURATION #================================================= From a561c794ec5dc4579bb33d7a38c2827e00c8fdc7 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Sat, 24 Jun 2023 01:13:03 +0200 Subject: [PATCH 11/14] [FIX] Update database on updates 2 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index f8f9e88..3df9c7a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -66,7 +66,7 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" # Update database -exec_as_app console.php database:update +cd "$install_dir" && ynh_exec_as "$app" php${phpversion} --define apc.enable_cli=1 console.php database:update #================================================= # NGINX CONFIGURATION From 556b14884462c2dd863a9e927900f5d3a5197d27 Mon Sep 17 00:00:00 2001 From: Jyhem Date: Sat, 24 Jun 2023 01:26:52 +0200 Subject: [PATCH 12/14] [ENH] Add upgrade test from v1 --- tests.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests.toml b/tests.toml index d56c96c..f84c8fa 100644 --- a/tests.toml +++ b/tests.toml @@ -2,6 +2,8 @@ test_format = 1.0 [default] + test_upgrade_from.a0d6dbd5ab00f11afdc1e876394da01a0bbb3d3c.name = "24.2 packaging v1" + [regular] only = ["install.subdir"] From 15a2a36c09e56bb4f43beb92fed5b0c13b142a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Jun 2023 11:29:06 +0200 Subject: [PATCH 13/14] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 8f7c4ad..a3ece20 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Tiki" description.en = "Wiki-based, content management system" description.fr = "Système de gestion de contenu basé sur Wiki" -version = "25.1~ynh1" +version = "25.1~ynh2" maintainers = ["eric_G"] From 1ec3404d62aa13264d51023fde932707c01991dd Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 24 Jun 2023 09:29:10 +0000 Subject: [PATCH 14/14] 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 8eead97..515370b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Tiki Wiki CMS Groupware is the Free / Libre / Open Source Web Application with the most built-in features. Use cases: Web Publishing / Collaboration / Project Management / Office Suite / Knowledge base / Shopping Cart / Social Networking / CRM / Membership / E-learning. Tiki Trackers is the built-in database web apps builder and low-code / no-code application framework. -**Shipped version:** 25.1~ynh1 +**Shipped version:** 25.1~ynh2 **Demo:** https://tiki.org/Try-Tiki diff --git a/README_fr.md b/README_fr.md index bcf13b0..8935ca7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Tiki Wiki CMS Groupware est l'application Web libre dotée du plus grand nombre de fonctionnalités intégrées. Cas d'utilisation: Publication Web / Collaboration / Gestion de projet / Suite bureautique / Gestion des connaissances / Panier d'achat / Réseau social / Gestion de communauté et clientèle (CRM) / Membrariat / Système de gestion de l'apprentissage (LMS). Les Tiki Trackers sont la composante intégrée pour le développement low-code / no-code et le générateur de formulaires et bases de données. -**Version incluse :** 25.1~ynh1 +**Version incluse :** 25.1~ynh2 **Démo :** https://tiki.org/Try-Tiki