From 887f8be3fa87cd98d630881acba76af21c75f79d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Fri, 8 Sep 2023 04:37:55 +0200 Subject: [PATCH 01/64] Update doc/ADMIN.md Ok Co-authored-by: Alexandre Aubin --- doc/ADMIN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 3d98559..7b6bf2e 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,5 +1,5 @@ ## Custom configurations -If you wish, you can add personal costum configurations by editing the `/var/www/paheko/config.local.user.php` file. To see the possibilities, you can read the `/var/www/paheko/config.dist.php` file first. +If you wish, you can add personal costum configurations by editing the `__INSTALL_DIR__/config.local.user.php` file. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. From fdb05425caeab13afc8a46cac8742c61ae9e9676 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 9 Sep 2023 16:44:10 +0200 Subject: [PATCH 02/64] Update manifest.toml release candidate RC8 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54a57ad..57398de 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh5" +version = "1.3.0~ynh6" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc7.tar.gz" - sha256 = "c0ef2bb160d6164cf43ead5d10f805b95db3841ce114f72316dcd9d41c1ddc54" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc8.tar.gz" + sha256 = "9e1fc23d9067d226706a91c24b1203e0adbea476d5f736f2de9ec755cc266494" autoupdate.strategy = "latest_github_tag" [resources.system_user] From f406412c583562a8344f4b2b80042bb316f0b5bf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Sep 2023 14:44:13 +0000 Subject: [PATCH 03/64] 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 3e24bda..3420e4f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh5 +**Shipped version:** 1.3.0~ynh6 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 56f8dcf..1cbd6c5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh5 +**Version incluse :** 1.3.0~ynh6 **Démo :** https://paheko.cloud/essai/ From c43dfda05cf6999af3812303024b21ed95ab2784 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 9 Sep 2023 17:06:40 +0200 Subject: [PATCH 04/64] Update upgrade correct version before release 1.3 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9a35983..94a536b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,7 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.9~ynh1; then +if ynh_compare_current_package_version --comparison le --version 1.2.12~ynh1; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" From 7dbdeb51df53f284e2a3baa2ef1cc78fbbfecbe3 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Mon, 11 Sep 2023 08:35:07 +0200 Subject: [PATCH 05/64] Update manifest.toml candidate release RC9, and remove autoupdate github as the repo is not on github --- manifest.toml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 57398de..b24be98 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,9 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc8.tar.gz" - sha256 = "9e1fc23d9067d226706a91c24b1203e0adbea476d5f736f2de9ec755cc266494" - autoupdate.strategy = "latest_github_tag" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc9.tar.gz" + sha256 = "575dd8c632a4bc684d450b5cb2491a459506b3b34311d963ccedebe120e94158" [resources.system_user] From 66adc5013680176b05a7cdf2ccd93866b222f6a9 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 18:06:41 +0200 Subject: [PATCH 06/64] Update upgrade fix old files should be removed --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 94a536b..d32d1db 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes data skel-dist config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 26d3e9d258f7fd552d7e5e1546bdd87cce8f8ad7 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 18:10:51 +0200 Subject: [PATCH 07/64] Update manifest.toml candidate release rc9 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index b24be98..7914923 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh6" +version = "1.3.0~ynh7" maintainers = ["rodinux"] From e90f60d14738bfd4d5560b8a9a95ce7249419736 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 16:10:55 +0000 Subject: [PATCH 08/64] 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 3420e4f..3354cb4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh6 +**Shipped version:** 1.3.0~ynh7 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 1cbd6c5..75cdedb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh6 +**Version incluse :** 1.3.0~ynh7 **Démo :** https://paheko.cloud/essai/ From 68e00d39be72ffb212145d07de57e2ba2a56b27d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 18:46:08 +0200 Subject: [PATCH 09/64] Update upgrade fix the namespace Paheko; on files --- scripts/upgrade | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d32d1db..10f9d8c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -71,11 +71,10 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.12~ynh1; then +if ynh_compare_current_package_version --comparison ge --version 1.2.11~ynh2; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" -ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php # Permissions on files and directories From df7adbc6d3208544c1f65a337239ddabd4f90640 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 20:26:46 +0200 Subject: [PATCH 10/64] Update manifest.toml candidate release 1.3-RC10 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index b24be98..7a4daa8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh6" +version = "1.3.0~ynh7" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc9.tar.gz" - sha256 = "575dd8c632a4bc684d450b5cb2491a459506b3b34311d963ccedebe120e94158" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc10.tar.gz" + sha256 = "1cfe7d0c97276e3fc846bedc9e2c913bb61ab82f67775f1e41a4c52e4ad2d7b6" [resources.system_user] From a1765a38e2f6f7379f6f512e01aa228d1a2e727d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 18:26:49 +0000 Subject: [PATCH 11/64] 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 3420e4f..3354cb4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh6 +**Shipped version:** 1.3.0~ynh7 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 1cbd6c5..75cdedb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh6 +**Version incluse :** 1.3.0~ynh7 **Démo :** https://paheko.cloud/essai/ From f64aa660f7f5dc162640098b1a5b04f70a1f30e4 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 20:37:24 +0200 Subject: [PATCH 12/64] Update upgrade add --full-replace=1 --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 94a536b..63bcb70 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes/ data/ skel-dist/ config.local.user.php" + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes data skel-dist config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -71,7 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.12~ynh1; then +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh2; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" From fb621f6dc44aaeede4fad7e3a59cf822ab1d13b1 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 21:26:41 +0200 Subject: [PATCH 13/64] Update upgrade try fix keep database --- scripts/upgrade | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 63bcb70..9544edd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes data skel-dist config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="config.local.user.php data" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -71,7 +71,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh2; then +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh3; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" @@ -102,7 +102,5 @@ sleep 5 #================================================= # END OF SCRIPT #================================================= -# remove directory duplicated -ynh_secure_remove --file="$install_dir/data/data" ynh_script_progression --message="Upgrade of $app completed" --last From 6a28cc87f6670dd0b2ed142feff7151cefda0672 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 21:50:09 +0200 Subject: [PATCH 14/64] Update upgrade try fix keep database and remove folder duplicated --- scripts/upgrade | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 9544edd..e3fe4d8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -78,6 +78,10 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # NOTE: Don't overwrite config.local.user.php +# Move the database on folder data/data created and remove the folder +mv $install_dir/data/data/association.sqlite $install_dir/data/ +ynh_secure_remove --file=$install_dir/data/data + # Permissions on files and directories chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -94,6 +98,10 @@ chmod 660 "$install_dir/config.local.user.php" #================================================= ynh_script_progression --message="Finalise upgrade" --weight=1 +# Move the database on folder data/data created and remove the folder +mv $install_dir/data/data/association.sqlite $install_dir/data/ +ynh_secure_remove --file=$install_dir/data/data + ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" From d5b51248c068e91ae2161452d78c84d52f745e5a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 21:56:42 +0200 Subject: [PATCH 15/64] Update upgrade try fix keep association.sqlite --- scripts/upgrade | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e3fe4d8..5818d7a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="config.local.user.php data" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite config.local.user.php data" fi chmod -R o-rwx "$install_dir" @@ -98,15 +98,13 @@ chmod 660 "$install_dir/config.local.user.php" #================================================= ynh_script_progression --message="Finalise upgrade" --weight=1 -# Move the database on folder data/data created and remove the folder -mv $install_dir/data/data/association.sqlite $install_dir/data/ -ynh_secure_remove --file=$install_dir/data/data - ynh_local_curl "/admin/index.php" sleep 5 ynh_local_curl "/index.php" sleep 5 +# Move the database on folder data/data created and remove the folder +ynh_secure_remove --file=$install_dir/data/data #================================================= # END OF SCRIPT #================================================= From 72283326a66babdf50ecfea0405b56034b474671 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 22:46:29 +0200 Subject: [PATCH 16/64] Update upgrade try fix --- scripts/upgrade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 10f9d8c..b831b54 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,7 +38,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite squelettes data skel-dist config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data skel-dist config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -71,11 +71,13 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison ge --version 1.2.11~ynh2; then +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh3; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi -ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" + # NOTE: Don't overwrite config.local.user.php +ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" +ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" From 7a3af8d6a9c5ec9202d5cd22dd5b97fed5b88f99 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 22:59:33 +0200 Subject: [PATCH 17/64] Update upgrade try fix keep the association.sqlite DB --- scripts/upgrade | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index b831b54..5fec1a8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,6 +29,12 @@ if [[ -z "${secret_key:-}" ]]; then ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi +#================================================= +# BACKUP SQLITE DATABASE +#================================================= +ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 +cp -a $install_dir/data/association.sqlite /tmp/ + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -79,6 +85,9 @@ fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +# Restore the sqlite DB +mv /tmp/association.sqlite $install_dir/data + # Permissions on files and directories chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From fb8879fed3b400c77c889fefcc597f856ce64607 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 23:08:07 +0200 Subject: [PATCH 18/64] Update upgrade fix keep the DB on a temporaly file --- scripts/upgrade | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5818d7a..5fec1a8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -29,6 +29,12 @@ if [[ -z "${secret_key:-}" ]]; then ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key fi +#================================================= +# BACKUP SQLITE DATABASE +#================================================= +ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 +cp -a $install_dir/data/association.sqlite /tmp/ + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -38,7 +44,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite config.local.user.php data" + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data skel-dist config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -74,13 +80,13 @@ fi if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh3; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" fi + +# NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -# NOTE: Don't overwrite config.local.user.php -# Move the database on folder data/data created and remove the folder -mv $install_dir/data/data/association.sqlite $install_dir/data/ -ynh_secure_remove --file=$install_dir/data/data +# Restore the sqlite DB +mv /tmp/association.sqlite $install_dir/data # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -103,10 +109,10 @@ sleep 5 ynh_local_curl "/index.php" sleep 5 -# Move the database on folder data/data created and remove the folder -ynh_secure_remove --file=$install_dir/data/data #================================================= # END OF SCRIPT #================================================= +# remove directory duplicated +ynh_secure_remove --file="$install_dir/data/data" ynh_script_progression --message="Upgrade of $app completed" --last From 66629f8b732edabc41bf385ce3b86deda35b1a5b Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 12 Sep 2023 23:09:05 +0200 Subject: [PATCH 19/64] Update manifest.toml Fix upgrade with DB on a temporaly file --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7a4daa8..8e88f00 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh7" +version = "1.3.0~ynh8" maintainers = ["rodinux"] From 3e0711191a792444f1accc2bf02f5f0ba227db3e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Sep 2023 21:09:09 +0000 Subject: [PATCH 20/64] 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 3354cb4..787c9c2 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh7 +**Shipped version:** 1.3.0~ynh8 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 75cdedb..f32bed2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh7 +**Version incluse :** 1.3.0~ynh8 **Démo :** https://paheko.cloud/essai/ From dbcf117afbc374eacf1446e66458d586482f0ad2 Mon Sep 17 00:00:00 2001 From: rodinux Date: Wed, 13 Sep 2023 20:09:24 +0200 Subject: [PATCH 21/64] add conditions for pass tests if upgrade from none initialyzed app --- scripts/upgrade | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5fec1a8..5182d42 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,10 @@ fi # BACKUP SQLITE DATABASE #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 + +if [ -f "$install_dir/data/association.sqlite" ];then cp -a $install_dir/data/association.sqlite /tmp/ +fi #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -86,7 +89,9 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Restore the sqlite DB -mv /tmp/association.sqlite $install_dir/data +if [ -f "/tmp/association.sqlite" ];then +mv /tmp/association.sqlite $install_dir/data +fi # Permissions on files and directories chmod -R o-rwx "$install_dir" From 77de3d94a307357bfd316b28622e9a6eabde5cb4 Mon Sep 17 00:00:00 2001 From: rodinux Date: Wed, 13 Sep 2023 21:35:19 +0200 Subject: [PATCH 22/64] folder no more in same place --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5182d42..67df8e5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -47,7 +47,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data skel-dist config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" From 10b68c1ccbe51d51f571babc5dbfa4482088ee62 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 14 Sep 2023 00:47:15 +0200 Subject: [PATCH 23/64] Update doc/ADMIN_fr.md --- doc/ADMIN_fr.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 91f7512..e6e0e37 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,4 +1,4 @@ ## Configurations personnelles -Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `/var/www/paheko/config.local.user.php`. -Pour voir les possibilités vous pouvez lire auparavant le fichier `/var/www/paheko/config.dist.php`. +Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.user.php`. +Pour voir les possibilités vous pouvez lire auparavant le fichier `__INSTALL_DIR__/config.dist.php`. From 96ddeb53d52b4dd9dc6214985544c36e18da5d8d Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 16 Sep 2023 08:59:19 +0200 Subject: [PATCH 24/64] better method for upgrade --- scripts/upgrade | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5fec1a8..c433912 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,8 @@ fi # BACKUP SQLITE DATABASE #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 -cp -a $install_dir/data/association.sqlite /tmp/ + +cp -R $install_dir/data /tmp/data #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -44,7 +45,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data skel-dist config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="data config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -86,7 +87,7 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Restore the sqlite DB -mv /tmp/association.sqlite $install_dir/data +rsync -a /tmp/data/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -113,6 +114,6 @@ sleep 5 # END OF SCRIPT #================================================= # remove directory duplicated -ynh_secure_remove --file="$install_dir/data/data" +ynh_secure_remove --file="tmp/data" ynh_script_progression --message="Upgrade of $app completed" --last From 800941d41101e1ffca1de62f928947eef593fc8a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 16 Sep 2023 09:11:56 +0200 Subject: [PATCH 25/64] correct process upgrade --- scripts/upgrade | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 67df8e5..e3407f6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,9 +34,8 @@ fi #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 -if [ -f "$install_dir/data/association.sqlite" ];then -cp -a $install_dir/data/association.sqlite /tmp/ -fi +# keep a data directory backup +cp -R $install_dir/data /tmp/data #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -88,10 +87,8 @@ fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -# Restore the sqlite DB -if [ -f "/tmp/association.sqlite" ];then -mv /tmp/association.sqlite $install_dir/data -fi +# Sync the data directory backup +rsync /tmp/data/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -117,7 +114,7 @@ sleep 5 #================================================= # END OF SCRIPT #================================================= -# remove directory duplicated -ynh_secure_remove --file="$install_dir/data/data" +# remove data directory backup +ynh_secure_remove --file="/tmp/data" ynh_script_progression --message="Upgrade of $app completed" --last From cbd076a82403fa1157254259e7924a64ac857ff2 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Sat, 16 Sep 2023 09:36:55 +0200 Subject: [PATCH 26/64] clean options backup data --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e3407f6..4985232 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ fi ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 # keep a data directory backup -cp -R $install_dir/data /tmp/data +cp -a $install_dir/data /tmp/data #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -88,7 +88,7 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Sync the data directory backup -rsync /tmp/data/ $install_dir/data/ +rsync -R /tmp/data/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" From 218264de436da6c496daf6119bf57ae430880734 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sun, 17 Sep 2023 22:18:40 +0200 Subject: [PATCH 27/64] Update doc/PRE_UPGRADE.d/1.3.0.md --- doc/PRE_UPGRADE.d/1.3.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/PRE_UPGRADE.d/1.3.0.md b/doc/PRE_UPGRADE.d/1.3.0.md index 1225343..62f7f4e 100644 --- a/doc/PRE_UPGRADE.d/1.3.0.md +++ b/doc/PRE_UPGRADE.d/1.3.0.md @@ -1 +1 @@ -We should encourage people to have a look at the Changelog: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 when upgrading to this version because there are major changes. If you have installed some plugins, not all will be compatibles. +We encourage you to have a look at the Changelog: https://fossil.kd2.org/paheko/wiki?name=Changelog/1.3 when upgrading to this version because there are major changes. If you have installed some plugins, not all will be compatibles. From c00f1da8c0cc2e408446702159a5d01fb98a66ac Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 14:48:00 +0200 Subject: [PATCH 28/64] order syntax --- scripts/upgrade | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4985232..614bab4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,11 +30,11 @@ if [[ -z "${secret_key:-}" ]]; then fi #================================================= -# BACKUP SQLITE DATABASE +# BACKUP SQLITE DATABASE AND DATAS #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 -# keep a data directory backup +# copy data directory backup cp -a $install_dir/data /tmp/data #================================================= @@ -46,7 +46,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -79,17 +79,24 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; th chmod 750 "$install_dir/config.local.user.php" ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" fi -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh3; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" -fi # NOTE: Don't overwrite config.local.user.php ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -# Sync the data directory backup +#================================================= +# RESTORE BACKUP SQLITE DATABASE AND DATAS +#================================================= +ynh_script_progression --message="Restore datas..." --weight=5 + +# Sync data directory backup rsync -R /tmp/data/ $install_dir/data/ +#================================================= +# FIX PERMISSIONS +#================================================= +ynh_script_progression --message="Fix permissions..." --weight=2 + # Permissions on files and directories chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" @@ -111,10 +118,11 @@ sleep 5 ynh_local_curl "/index.php" sleep 5 +# remove directory duplicated +ynh_secure_remove --file="/tmp/data" + #================================================= # END OF SCRIPT #================================================= -# remove data directory backup -ynh_secure_remove --file="/tmp/data" ynh_script_progression --message="Upgrade of $app completed" --last From 25f2fa92ef1e0cde2859f18004084e2c910f8a12 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 14:49:44 +0200 Subject: [PATCH 29/64] secure temporary directory for data --- scripts/upgrade | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index c433912..b8055ca 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -34,7 +34,9 @@ fi #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 -cp -R $install_dir/data /tmp/data +# copy data directory backup +file=$(mktemp -d $app_dataXXX --suffix=BKP) +cp -a $install_dir/data /var/www/$file #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -45,7 +47,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="data config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -86,8 +88,8 @@ fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -# Restore the sqlite DB -rsync -a /tmp/data/ $install_dir/data/ +# Sync data directory backup +rsync -R /var/www/$file/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -110,10 +112,11 @@ sleep 5 ynh_local_curl "/index.php" sleep 5 +# remove data directory backup +ynh_secure_remove --file="/var/www/$file" + #================================================= # END OF SCRIPT #================================================= -# remove directory duplicated -ynh_secure_remove --file="tmp/data" ynh_script_progression --message="Upgrade of $app completed" --last From 7a203f035bc1640afa43d8b8c354ddfcd74b0175 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 15:30:39 +0200 Subject: [PATCH 30/64] secure temporary directory for data --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index b8055ca..934fbae 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,7 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig # copy data directory backup file=$(mktemp -d $app_dataXXX --suffix=BKP) -cp -a $install_dir/data /var/www/$file +rsync -R $install_dir/data/ /var/www/$tmp_data_backup/ #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -89,7 +89,7 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Sync data directory backup -rsync -R /var/www/$file/ $install_dir/data/ +rsync -R /var/www/$tmp_data_backup/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -113,7 +113,7 @@ ynh_local_curl "/index.php" sleep 5 # remove data directory backup -ynh_secure_remove --file="/var/www/$file" +ynh_secure_remove --file="/var/www/$tmp_data_backup" #================================================= # END OF SCRIPT From 56b6acbd0444bcd463a91fb6ce759a01b6b9f757 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 16:41:12 +0200 Subject: [PATCH 31/64] secure temporary directory for data --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 934fbae..e7da054 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ fi ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 # copy data directory backup -file=$(mktemp -d $app_dataXXX --suffix=BKP) +tmp_data_backup=$(mktemp -d $app_dataXXX --suffix=BKP) rsync -R $install_dir/data/ /var/www/$tmp_data_backup/ #================================================= From c1f585851eda643952947eceb2c4311e0116eefd Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 17:27:41 +0200 Subject: [PATCH 32/64] secure temporary directory for data --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index e7da054..4faa08e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,8 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig # copy data directory backup tmp_data_backup=$(mktemp -d $app_dataXXX --suffix=BKP) -rsync -R $install_dir/data/ /var/www/$tmp_data_backup/ +echo "$tmp_data_backup" +rsync -a $install_dir/data/ $tmp_data_backup/ #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -89,7 +90,7 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Sync data directory backup -rsync -R /var/www/$tmp_data_backup/ $install_dir/data/ +rsync -a /var/www/$tmp_data_backup/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" From ab39a4a5e25f4b3a299537f2f02dc659b3699f20 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 17:28:06 +0200 Subject: [PATCH 33/64] secure temporary directory for data --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4faa08e..55bf1c5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -90,7 +90,7 @@ ynh_add_config --template="config.local.php" --destination="$install_dir/config. ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" # Sync data directory backup -rsync -a /var/www/$tmp_data_backup/ $install_dir/data/ +rsync -a $tmp_data_backup/ $install_dir/data/ # Permissions on files and directories chmod -R o-rwx "$install_dir" From 5624b22dc54a82959d9748fa7bd25e62bd731a02 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 17:40:29 +0200 Subject: [PATCH 34/64] secure temporary directory for data --- scripts/upgrade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 55bf1c5..7354487 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,6 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig # copy data directory backup tmp_data_backup=$(mktemp -d $app_dataXXX --suffix=BKP) -echo "$tmp_data_backup" rsync -a $install_dir/data/ $tmp_data_backup/ #================================================= @@ -48,7 +47,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="association.sqlite data config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --keep="config.local.user.php" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -114,7 +113,7 @@ ynh_local_curl "/index.php" sleep 5 # remove data directory backup -ynh_secure_remove --file="/var/www/$tmp_data_backup" +ynh_secure_remove --file="$tmp_data_backup" #================================================= # END OF SCRIPT From 7ff27b65a1374abd7dad46c90cceb1a4aaf7594d Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 20:17:56 +0200 Subject: [PATCH 35/64] try fix temporally secure folder with mktemp --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7354487..3f98542 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -35,7 +35,7 @@ fi ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 # copy data directory backup -tmp_data_backup=$(mktemp -d $app_dataXXX --suffix=BKP) +tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ #================================================= From e58b73096ffc75ecac7698c8aff715223347d73f Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 20:36:06 +0200 Subject: [PATCH 36/64] more readable process upgrade --- scripts/upgrade | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 3f98542..7f39c5d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -30,7 +30,7 @@ if [[ -z "${secret_key:-}" ]]; then fi #================================================= -# BACKUP SQLITE DATABASE +# BACKUP SQLITE DATABASE AND DATAS #================================================= ynh_script_progression --message="Backup of the DB in temporary file...." --weight=5 @@ -88,9 +88,19 @@ fi ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" +#================================================= +# RESTORE BACKUP SQLITE DATABASE AND DATAS +#================================================= +ynh_script_progression --message="Restore datas..." --weight=5 + # Sync data directory backup rsync -a $tmp_data_backup/ $install_dir/data/ +#================================================= +# FIX PERMISSIONS +#================================================= +ynh_script_progression --message="Fix permissions..." --weight=2 + # Permissions on files and directories chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" From 17b4730143caca50f5563820a47760d353bcc57e Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 20:39:34 +0200 Subject: [PATCH 37/64] add a tag version --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7914923..200f639 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh7" +version = "1.3.0~ynh9" maintainers = ["rodinux"] From f7be51ecc1541277398cee1fd750dc1d6d00324c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 18 Sep 2023 18:39:46 +0000 Subject: [PATCH 38/64] 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 3354cb4..401fccd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh7 +**Shipped version:** 1.3.0~ynh9 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 75cdedb..1e0d3b8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh7 +**Version incluse :** 1.3.0~ynh9 **Démo :** https://paheko.cloud/essai/ From ca062df330927d2854ce72714211f51c6ded63f9 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 23:21:45 +0200 Subject: [PATCH 39/64] try also keep the file config.local.user.php --- conf/config.local.php | 4 ++-- scripts/install | 4 ++-- scripts/restore | 5 +++++ scripts/upgrade | 19 ++++++++++++------- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/conf/config.local.php b/conf/config.local.php index 0080731..8fb3a75 100644 --- a/conf/config.local.php +++ b/conf/config.local.php @@ -3,7 +3,7 @@ /** * NE PAS MODIFIER CE FICHIER. Il est regénéré automatiquement à chaque mise à jour de Yunohost * - * Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier config.local.user.php + * Pour ajouter vos configurations personnalisées, rendez-vous dans le fichier data/config.local.user.php */ require '__INSTALL_DIR__/config.local.yunohost.php'; -require '__INSTALL_DIR__/config.local.user.php'; +require '__INSTALL_DIR__/data/config.local.user.php'; diff --git a/scripts/install b/scripts/install index d76907c..eaf582e 100644 --- a/scripts/install +++ b/scripts/install @@ -50,7 +50,7 @@ ynh_app_setting_set --app=$app --key=secret_key --value=$secret_key # Install configuration files ynh_add_config --template="config.local.php" --destination="$install_dir/config.local.php" ynh_add_config --template="config.local.yunohost.php" --destination="$install_dir/config.local.yunohost.php" -ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" +ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php" # Permissions on files and directories chmod -R o-rwx "$install_dir" @@ -61,7 +61,7 @@ find "$install_dir/data" -type d -exec chmod 770 {} + find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" -chmod 660 "$install_dir/config.local.user.php" +chmod 660 "$install_dir/data/config.local.user.php" #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index c1ab315..dc0c5de 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,7 +26,12 @@ find "$install_dir/data" -type d -exec chmod 770 {} + find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" + +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then chmod 660 "$install_dir/config.local.user.php" +else +chmod 660 "$install_dir/data/config.local.user.php" +fi #================================================= # RESTORE THE PHP-FPM CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 7f39c5d..80f47d4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,6 +38,10 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then + mv $install_dir/config.local.user.php $tmp_data_backup/ +fi + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -47,7 +51,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="config.local.user.php" --full_replace=1 + ynh_setup_source --dest_dir="$install_dir" --full_replace=1 fi chmod -R o-rwx "$install_dir" @@ -77,11 +81,8 @@ ynh_add_nginx_config ynh_script_progression --message="Updating a configuration file..." --weight=5 if ynh_compare_current_package_version --comparison lt --version 1.1.15~ynh1; then - chmod 750 "$install_dir/config.local.user.php" - ynh_add_config --template="config.local.user.php" --destination="$install_dir/config.local.user.php" -fi -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh3; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" + chmod 750 "$install_dir/data/config.local.user.php" + ynh_add_config --template="config.local.user.php" --destination="$install_dir/data/config.local.user.php" fi # NOTE: Don't overwrite config.local.user.php @@ -96,6 +97,10 @@ ynh_script_progression --message="Restore datas..." --weight=5 # Sync data directory backup rsync -a $tmp_data_backup/ $install_dir/data/ +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/data/config.local.user.php" +fi + #================================================= # FIX PERMISSIONS #================================================= @@ -110,7 +115,7 @@ find "$install_dir/data" -type d -exec chmod 770 {} + find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" -chmod 660 "$install_dir/config.local.user.php" +chmod 660 "$install_dir/data/config.local.user.php" #================================================= # FINALISE UPGRADE From a67f02f5b555a387f6e117e7c8b4f49b19c73ed0 Mon Sep 17 00:00:00 2001 From: rodinux Date: Mon, 18 Sep 2023 23:46:38 +0200 Subject: [PATCH 40/64] try also keep the file config.local.user.php --- scripts/upgrade | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 80f47d4..b98d9a0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -39,9 +39,16 @@ tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" mv $install_dir/config.local.user.php $tmp_data_backup/ fi +if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh8; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" + mv $install_dir/config.local.user.php $tmp_data_backup/ +fi + + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -97,9 +104,6 @@ ynh_script_progression --message="Restore datas..." --weight=5 # Sync data directory backup rsync -a $tmp_data_backup/ $install_dir/data/ -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/data/config.local.user.php" -fi #================================================= # FIX PERMISSIONS From 4a3f1bd230e9b9de73d6846ad5838d2e1f4e6e81 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 19 Sep 2023 00:01:17 +0200 Subject: [PATCH 41/64] try also keep the file config.local.user.php --- scripts/restore | 2 +- scripts/upgrade | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/restore b/scripts/restore index dc0c5de..cfd17f9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -27,7 +27,7 @@ find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then +if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh8; then chmod 660 "$install_dir/config.local.user.php" else chmod 660 "$install_dir/data/config.local.user.php" diff --git a/scripts/upgrade b/scripts/upgrade index b98d9a0..e10c8a6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,13 +38,12 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh4; then +if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh1; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" mv $install_dir/config.local.user.php $tmp_data_backup/ fi -if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh8; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" +if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh9; then mv $install_dir/config.local.user.php $tmp_data_backup/ fi From ff4718b26f65ac8ac62b188692e731056ec862a6 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 19 Sep 2023 00:43:08 +0200 Subject: [PATCH 42/64] version cadidate release RC-12 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 200f639..541429e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc9.tar.gz" - sha256 = "575dd8c632a4bc684d450b5cb2491a459506b3b34311d963ccedebe120e94158" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc12.tar.gz" + sha256 = "29c599a7fa086ca6e81617853ddeeb6b6a80b8c5444000e90222af5a1ec99870" [resources.system_user] From 150a2380aaeec612bcf0f40f85a829fd4b487393 Mon Sep 17 00:00:00 2001 From: rodinux Date: Tue, 19 Sep 2023 22:14:39 +0200 Subject: [PATCH 43/64] fix how keep the file config.local.user.php on data folder path --- scripts/restore | 7 ++----- scripts/upgrade | 10 ++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/scripts/restore b/scripts/restore index cfd17f9..c42af40 100644 --- a/scripts/restore +++ b/scripts/restore @@ -26,11 +26,8 @@ find "$install_dir/data" -type d -exec chmod 770 {} + find "$install_dir/data" -type f -exec chmod 660 {} + chmod 440 "$install_dir/config.local.php" chmod 440 "$install_dir/config.local.yunohost.php" - -if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh8; then -chmod 660 "$install_dir/config.local.user.php" -else -chmod 660 "$install_dir/data/config.local.user.php" +if [[ -f "$install_dir/config.local.user.php" ]]; then + chmod 660 "$install_dir/config.local.user.php" fi #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index e10c8a6..439ad51 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -38,16 +38,14 @@ ynh_script_progression --message="Backup of the DB in temporary file...." --weig tmp_data_backup=$(mktemp -d) rsync -a $install_dir/data/ $tmp_data_backup/ -if ynh_compare_current_package_version --comparison le --version 1.2.11~ynh1; then - ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$install_dir/config.local.user.php" - mv $install_dir/config.local.user.php $tmp_data_backup/ +if [[ -f "$install_dir/config.local.user.php" ]]; then + cp -a $install_dir/config.local.user.php $tmp_data_backup/ fi -if ynh_compare_current_package_version --comparison le --version 1.3.0~ynh9; then - mv $install_dir/config.local.user.php $tmp_data_backup/ +if [[ $(grep "Garradin" $tmp_data_backup/config.local.user.php) ]] ; then + ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$tmp_data_backup/config.local.user.php" fi - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= From 59171b24886848ca78ccea04bf51f72a01bff394 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 19 Sep 2023 21:04:42 +0000 Subject: [PATCH 44/64] Auto-update README --- README.md | 2 -- README_fr.md | 1 - 2 files changed, 3 deletions(-) diff --git a/README.md b/README.md index ef63382..401fccd 100644 --- a/README.md +++ b/README.md @@ -21,10 +21,8 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. - **Shipped version:** 1.3.0~ynh9 - **Demo:** https://paheko.cloud/essai/ ## Screenshots diff --git a/README_fr.md b/README_fr.md index 9bdcf9f..1e0d3b8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -32,7 +32,6 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie **Version incluse :** 1.3.0~ynh9 - **Démo :** https://paheko.cloud/essai/ ## Captures d’écran From c0f8b5a439207691f8620fffcaf0785d4afb8216 Mon Sep 17 00:00:00 2001 From: rodinux Date: Wed, 20 Sep 2023 19:59:26 +0200 Subject: [PATCH 45/64] secure remove unused files --- scripts/upgrade | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 7c88dfc..e9d91df 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -42,7 +42,7 @@ if [[ -f "$install_dir/config.local.user.php" ]]; then cp -a $install_dir/config.local.user.php $tmp_data_backup/ fi -if [[ $(grep "Garradin" $tmp_data_backup/config.local.user.php) ]] ; then +if [[ $(grep "Garradin" "$tmp_data_backup/config.local.user.php") ]] ; then ynh_replace_string --match_string="namespace Garradin;" --replace_string="namespace Paheko;" --target_file="$tmp_data_backup/config.local.user.php" fi @@ -130,6 +130,16 @@ sleep 5 # remove data directory backup ynh_secure_remove --file="$tmp_data_backup" +# clean duplicate folder if exist +if [[ -d "$install_dir/data/data" ]]; then + ynh_secure_remove --file="$install_dir/data/data" +fi + +# clean unused file if exist +if [[ -f "$install_dir/config.local.user.php" ]]; then + ynh_secure_remove --file="$install_dir/config.local.user.php" +fi + #================================================= # END OF SCRIPT #================================================= From a18eb3b1f8eb0c129205b0f0a4b8f5353cd9233d Mon Sep 17 00:00:00 2001 From: rodinux Date: Sun, 24 Sep 2023 22:45:57 +0200 Subject: [PATCH 46/64] release candidate Rc13 --- README.md | 2 +- README_fr.md | 2 +- manifest.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 401fccd..214f90d 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh9 +**Shipped version:** 1.3.0~ynh10 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 1e0d3b8..8083e98 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh9 +**Version incluse :** 1.3.0~ynh10 **Démo :** https://paheko.cloud/essai/ diff --git a/manifest.toml b/manifest.toml index 541429e..d925fd4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh9" +version = "1.3.0~ynh10" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc12.tar.gz" - sha256 = "29c599a7fa086ca6e81617853ddeeb6b6a80b8c5444000e90222af5a1ec99870" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc13.tar.gz" + sha256 = "36981c43949745117b8981945c06ed2318383d1ce4e04d91d66e73d994995a92" [resources.system_user] From 7b18d530926535f208a1efc7890228614c8a99e8 Mon Sep 17 00:00:00 2001 From: rodinux Date: Wed, 27 Sep 2023 16:27:15 +0200 Subject: [PATCH 47/64] version canidate release RC14 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index d925fd4..3a723f1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh10" +version = "1.3.0~ynh11" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc13.tar.gz" - sha256 = "36981c43949745117b8981945c06ed2318383d1ce4e04d91d66e73d994995a92" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc14.tar.gz" + sha256 = "4d90459f2a659fbe30bb16776bdd580d3f7f51278923b2961cf4524f5ca4ebf3" [resources.system_user] From 25b22db5f44458cda56f779196760d80c51a65ee Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 27 Sep 2023 14:27:24 +0000 Subject: [PATCH 48/64] 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 214f90d..4b0c77f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh10 +**Shipped version:** 1.3.0~ynh11 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 8083e98..148ea77 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh10 +**Version incluse :** 1.3.0~ynh11 **Démo :** https://paheko.cloud/essai/ From e9bf7fd5022209e7472acdf509f94a8a1fcc9c92 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 4 Oct 2023 19:31:18 +0200 Subject: [PATCH 49/64] Update manifest.toml Release stable version --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 3a723f1..bcd6cf3 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh11" +version = "1.3.0~ynh12" maintainers = ["rodinux"] @@ -42,8 +42,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0-rc14.tar.gz" - sha256 = "4d90459f2a659fbe30bb16776bdd580d3f7f51278923b2961cf4524f5ca4ebf3" + url = "https://fossil.kd2.org/paheko/uv/paheko-1.3.0.tar.gz" + sha256 = "2b5552db642a05edabb21a7187027c3cf3b2e0ec3cfb5921106de99a9453755c" [resources.system_user] From 9ee1eb4495c6341b62b121195599bc3189d11a0e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 4 Oct 2023 17:32:17 +0000 Subject: [PATCH 50/64] Auto-update README --- README.md | 3 +-- README_fr.md | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4b0c77f..e4a3a52 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh11 +**Shipped version:** 1.3.0~ynh12 **Demo:** https://paheko.cloud/essai/ @@ -34,7 +34,6 @@ It is the tool of choice for managing an association, a sports club, an NGO, etc * Official app website: * Official admin documentation: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 148ea77..2f83589 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh11 +**Version incluse :** 1.3.0~ynh12 **Démo :** https://paheko.cloud/essai/ @@ -43,7 +43,6 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 893c29d91e65736591e741e9d2081f00f3a9a998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:19:52 +0200 Subject: [PATCH 51/64] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index bcd6cf3..ee280c2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -53,4 +53,4 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-sqlite3 php8.2-gd php8.2-intl php8.2-cli php8.2-gnupg php8.2-mbstring" + packages = "php8.2-sqlite3, php8.2-gd, php8.2-intl, php8.2-cli, php8.2-gnupg, php8.2-mbstring" From 3a9e1dd8e24356eec10c3c45cd266cdef691e16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:20:17 +0200 Subject: [PATCH 52/64] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ee280c2..1565b77 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Paheko" description.en = "Software to manage association" description.fr = "Logiciel libre de gestion d'association" -version = "1.3.0~ynh12" +version = "1.3.0~ynh1" maintainers = ["rodinux"] From 9382cccff0f0590169b583a5a9c9796e691b3d32 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Oct 2023 16:20:21 +0000 Subject: [PATCH 53/64] 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 e4a3a52..6bd7a11 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Paheko (we chose the name Paheko, a word from the Māori language meaning "to co It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. -**Shipped version:** 1.3.0~ynh12 +**Shipped version:** 1.3.0~ynh1 **Demo:** https://paheko.cloud/essai/ diff --git a/README_fr.md b/README_fr.md index 2f83589..396e942 100644 --- a/README_fr.md +++ b/README_fr.md @@ -30,7 +30,7 @@ Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie ![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) -**Version incluse :** 1.3.0~ynh12 +**Version incluse :** 1.3.0~ynh1 **Démo :** https://paheko.cloud/essai/ From c605e674597908a8b272ba94b71ff7fabb35ffa6 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:25:23 +0200 Subject: [PATCH 54/64] Update doc/ADMIN.md Co-authored-by: Alexandre Aubin <4533074+alexAubin@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 f242798..92f1ecc 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,3 +1,3 @@ ## Custom configurations -If you wish, you can add personal costum configurations by editing the `__INSTALL_DIR__/config.local.user.php` file. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. +If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.user.php`. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. From 51bd6aeebef5ad4058563046c5a00c1f64e4fa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:27:47 +0200 Subject: [PATCH 55/64] Add pre install --- doc/PRE_INSTALL.md | 1 + doc/PRE_INSTALL_fr.md | 1 + manifest.toml | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 doc/PRE_INSTALL.md create mode 100644 doc/PRE_INSTALL_fr.md diff --git a/doc/PRE_INSTALL.md b/doc/PRE_INSTALL.md new file mode 100644 index 0000000..4ce1f05 --- /dev/null +++ b/doc/PRE_INSTALL.md @@ -0,0 +1 @@ +The SSO is not implemented for this app and YunoHost is not sure for hundred of users... diff --git a/doc/PRE_INSTALL_fr.md b/doc/PRE_INSTALL_fr.md new file mode 100644 index 0000000..cc33de3 --- /dev/null +++ b/doc/PRE_INSTALL_fr.md @@ -0,0 +1 @@ +Le SSO n'est pas implémenté pour cette application et YunoHost n'est pas sûr pour une centaine d'utilisateurs... diff --git a/manifest.toml b/manifest.toml index 1565b77..81063cb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -35,8 +35,6 @@ ram.runtime = "50M" default = "/paheko" [install.init_main_permission] - help.en = "The SSO is not implemented for this app and YunoHost is not sure for hundred of users..." - help.fr = "Le SSO n'est pas implémenté pour cette application et YunoHost n'est pas sûr pour une centaine d'utilisateurs..." type = "group" default = "visitors" From 815a3b82164b9066b93a6417138406c63eef87c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:28:42 +0200 Subject: [PATCH 56/64] Cleaning --- doc/DESCRIPTION.md | 4 +--- doc/DESCRIPTION_fr.md | 13 +------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 2d9c39a..d2aeaab 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1,3 +1 @@ -Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. - -It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 16f89f6..ff4316c 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1,12 +1 @@ -Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. - -## Garradin devient Paheko ! -### Pourquoi changer de nom ? - - Il est apparu que la prononciation de "Garradin" en français est parfois un peu compliquée, de même que son orthographe. - - Il existe déjà un logiciel commercial nommé "Garradin" en Australie, qui fait de la finance pour de grands groupes. Pour le moment cela ne posait pas de problème car notre solution de gestion d'association n'était disponible qu'en français et jusque là n'avait pas beaucoup de portée. Mais on aimerait bien pouvoir proposer le logiciel dans d'autres langues dans les années à venir, et comme Garradin (le projet français) commence à être assez connu, il semble nécessaire de limiter les risques de confusion à l'avenir avec cette solution commerciale. - - Vous pouvez mettre à jour Garradin avec Paheko ! - -![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) +Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc. From f72abb89498e8e748062509ddcf765fc5dce0578 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Oct 2023 16:28:46 +0000 Subject: [PATCH 57/64] Auto-update README --- README.md | 4 +--- README_fr.md | 13 +------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 6bd7a11..14360c2 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Paheko (we chose the name Paheko, a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. - -It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. **Shipped version:** 1.3.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 396e942..6612ebe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,18 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Paheko (Nous avons choisi le nom Paheko, un mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc. - -## Garradin devient Paheko ! -### Pourquoi changer de nom ? - - Il est apparu que la prononciation de "Garradin" en français est parfois un peu compliquée, de même que son orthographe. - - Il existe déjà un logiciel commercial nommé "Garradin" en Australie, qui fait de la finance pour de grands groupes. Pour le moment cela ne posait pas de problème car notre solution de gestion d'association n'était disponible qu'en français et jusque là n'avait pas beaucoup de portée. Mais on aimerait bien pouvoir proposer le logiciel dans d'autres langues dans les années à venir, et comme Garradin (le projet français) commence à être assez connu, il semble nécessaire de limiter les risques de confusion à l'avenir avec cette solution commerciale. - - Vous pouvez mettre à jour Garradin avec Paheko ! - -![Logo Paheko](https://master.garradin.eu/garradin-devient-paheko/logo_v3_small-fs8.png) +Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc. **Version incluse :** 1.3.0~ynh1 From 8d4a0fad46f5aed9fad7985b93363d922d761b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:28:49 +0200 Subject: [PATCH 58/64] Update DESCRIPTION.md --- doc/DESCRIPTION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index d2aeaab..f02dc7c 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. From d0a9bf2bef9c2d478ecd4a7c5159279b0d260fb1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Oct 2023 16:29:00 +0000 Subject: [PATCH 59/64] Auto-update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14360c2..5e37628 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc.. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. **Shipped version:** 1.3.0~ynh1 From 0962740823dc6b7da6b0bb2203ab774a5d183a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:29:30 +0200 Subject: [PATCH 60/64] cleaning --- doc/ADMIN.md | 2 -- doc/ADMIN_fr.md | 2 -- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 92f1ecc..58773d8 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,3 +1 @@ -## Custom configurations - If you wish, you can add custom configurations inside `__INSTALL_DIR__/config.local.user.php`. To see the possibilities, you can read the `__INSTALL_DIR__/config.dist.php` file first. diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index e6e0e37..457fcbe 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,4 +1,2 @@ -## Configurations personnelles - Vous pouvez si vous le souhaitez ajouter des configurations personnelles en éditant le fichier `__INSTALL_DIR__/config.local.user.php`. Pour voir les possibilités vous pouvez lire auparavant le fichier `__INSTALL_DIR__/config.dist.php`. diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index f02dc7c..3ba4e49 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index ff4316c..8f02fb6 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc. +Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents. From 55d611f8f628f55d690b6ad4be18013db704f797 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 6 Oct 2023 16:29:39 +0000 Subject: [PATCH 61/64] 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 5e37628..1986546 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview -Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. +Paheko (a word from the Māori language meaning "to cooperate", illustrating the purpose of the software: to improve together the daily management of an association) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members. **Shipped version:** 1.3.0~ynh1 diff --git a/README_fr.md b/README_fr.md index 6612ebe..83acdf2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po ## Vue d’ensemble -Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc. +Paheko (mot de la langue Māori qui signifie « coopérer », illustrant le but du logiciel : améliorer ensemble le quotidien de la gestion d'une association) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents. **Version incluse :** 1.3.0~ynh1 From 47aa842f9bd18c3ca19ff15d94649226b6e4c839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:33:41 +0200 Subject: [PATCH 62/64] cleaning --- scripts/install | 9 ++------- scripts/remove | 9 ++------- scripts/restore | 9 +++------ scripts/upgrade | 9 ++------- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/scripts/install b/scripts/install index eaf582e..aa44ceb 100644 --- a/scripts/install +++ b/scripts/install @@ -21,18 +21,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# SYSTEM CONFIGURATION #================================================= -ynh_script_progression --message="Configuring PHP-FPM..." --weight=5 +ynh_script_progression --message="Adding system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Configuring NGINX web server..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config diff --git a/scripts/remove b/scripts/remove index 4993569..5b17c2d 100644 --- a/scripts/remove +++ b/scripts/remove @@ -10,18 +10,13 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE NGINX CONFIGURATION +# REMOVE SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1 +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the dedicated NGINX config ynh_remove_nginx_config -#================================================= -# REMOVE PHP-FPM CONFIGURATION -#================================================= -ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2 - # Remove the dedicated PHP-FPM config ynh_remove_fpm_config diff --git a/scripts/restore b/scripts/restore index c42af40..9a43dad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -30,18 +30,15 @@ if [[ -f "$install_dir/config.local.user.php" ]]; then chmod 660 "$install_dir/config.local.user.php" fi +#================================================= +# RESTORE SYSTEM CONFIGURATIONS #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the PHP-FPM configuration..." --weight=6 +ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" -#================================================= -# RESTORE THE NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 97b35c0..e2f7aea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -61,18 +61,13 @@ chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" #================================================= -# PHP-FPM CONFIGURATION +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 # Create a dedicated PHP-FPM config ynh_add_fpm_config -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - # Create a dedicated NGINX config ynh_add_nginx_config From 179a46d122279fe62aa7a5ace30bf86edd989a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:51:26 +0200 Subject: [PATCH 63/64] Update config.local.user.php --- conf/config.local.user.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.local.user.php b/conf/config.local.user.php index 04b8d27..dbcdf62 100644 --- a/conf/config.local.user.php +++ b/conf/config.local.user.php @@ -2,7 +2,7 @@ /** * Ce fichier représente un exemple des constantes de configuration - * disponibles pour Garradin. + * disponibles pour Paheko. * * Modifiez ce fichier à votre guise, il ne sera pas modifié lors des mises à jour. * Consultez le fichier config.dist.php pour disposer d'un exemple. @@ -10,4 +10,4 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Garradin; +namespace Paheko; From 8dde8df78635ec12384e8794bb8d05e3d4292ed7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 6 Oct 2023 18:55:38 +0200 Subject: [PATCH 64/64] Update config.local.yunohost.php --- conf/config.local.yunohost.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/config.local.yunohost.php b/conf/config.local.yunohost.php index 3cd4e76..ecc707a 100644 --- a/conf/config.local.yunohost.php +++ b/conf/config.local.yunohost.php @@ -10,7 +10,7 @@ */ // Nécessaire pour situer les constantes dans le bon namespace -namespace Garradin; +namespace Paheko; /** * Clé secrète, doit être unique à chaque instance de Garradin