From 7d627d9a906d50f730a7b1d43293eefe529aeaf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:15:47 +0200 Subject: [PATCH 01/10] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 74b11c4..0aa7a87 100644 --- a/manifest.toml +++ b/manifest.toml @@ -60,8 +60,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/fisharebest/webtrees/releases/download/2.1.17/webtrees-2.1.17.zip" - sha256 = "91599632d1887d268f3ea7ce549138db508aca84b60d0c74106b6968be00b381" + url = "https://github.com/fisharebest/webtrees/releases/download/2.1.18/webtrees-2.1.18.zip" + sha256 = "33808c8c39df9ff6120ddf55741638bb0287c6617527157abe8786aaa7c30ea2" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -72,7 +72,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server php8.2-mbstring php8.2-mysql php8.2-zip php8.2-gd php8.2-xml php8.2-curl php8.2-intl mailutils" + packages = "mariadb-server, php8.2-mbstring, php8.2-mysql, php8.2-zip, php8.2-gd, php8.2-xml, php8.2-curl, php8.2-intl, mailutils" [resources.database] type = "mysql" From a2f1a5e1b22988b60196ddcc68f3f59ddaabdd3c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 19 Oct 2023 07:15:58 +0000 Subject: [PATCH 02/10] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index da0b598..edf51a8 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,6 @@ Webtrees allows you to view and edit your genealogy on your website. It has full * 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 08e92f0..7f49512 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,7 +36,6 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s * 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 9cadaf7922a15499e76947ada3d5d12d63fc8178 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Thu, 19 Oct 2023 18:55:03 +0200 Subject: [PATCH 03/10] Upgrade Yunohost version (#84) * Testing (#83) * Update manifest.toml * Auto-update README --------- Co-authored-by: yunohost-bot * update package version to coordinate with upstream --------- Co-authored-by: Alexandre Aubin Co-authored-by: eric_G <46165813+ericgaspar@users.noreply.github.com> Co-authored-by: yunohost-bot --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0aa7a87..f41c138 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Webtrees" description.en = "Web-based genealogy application" description.fr = "Logiciel libre de généalogie en ligne" -version = "2.1.17~ynh1" +version = "2.1.18~ynh1" maintainers = [] From 8485418f40414fd9caafc2c98959b5450679fdeb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 19 Oct 2023 16:55:12 +0000 Subject: [PATCH 04/10] 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 edf51a8..75462b4 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Shipped version:** 2.1.17~ynh1 +**Shipped version:** 2.1.18~ynh1 **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo diff --git a/README_fr.md b/README_fr.md index 7f49512..6f0fb05 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive. -**Version incluse :** 2.1.17~ynh1 +**Version incluse :** 2.1.18~ynh1 **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo From 6734620e04377e743e617d4bc9784ad91344c94a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Nov 2023 08:25:23 +0000 Subject: [PATCH 05/10] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 75462b4..5518e27 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full * Official app website: * Official admin documentation: * Upstream app code repository: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 6f0fb05..98ba1dc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -36,6 +36,7 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s * Site officiel de l’app : * Documentation officielle de l’admin : * Dépôt de code officiel de l’app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 2d15b132c7d13ca7bcc01b57bc6c5c80ab0f9e4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:30:30 +0100 Subject: [PATCH 06/10] fix --- conf/sql/admin.sql | 2 +- scripts/install | 8 ++++---- scripts/upgrade | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/sql/admin.sql b/conf/sql/admin.sql index 16c6ba5..b0b2d93 100644 --- a/conf/sql/admin.sql +++ b/conf/sql/admin.sql @@ -1,3 +1,3 @@ -INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD__'); +INSERT INTO `wt_user` (`user_id`, `user_name`, `real_name`, `email`, `password`) VALUES (NULL, '__USER_NAME__', '__NAME__', '__USER_EMAIL__', '__ADMIN_PASSWORD_HASHED__'); INSERT INTO `wt_user_setting` (`user_id`, `setting_name`, `setting_value`) VALUES ('1', 'canadmin', '1'), ('1', 'verified', '1'), ('1', 'verified_by_admin', '1'); diff --git a/scripts/install b/scripts/install index 29496b7..6ccb81f 100755 --- a/scripts/install +++ b/scripts/install @@ -45,17 +45,17 @@ ynh_script_progression --message="Configuring NGINX web server..." ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # MODIFY A CONFIG FILE #================================================= # Adding the details of the database to the config file -ynh_add_config --template="../conf/config.ini.php" --destination="$install_dir/data/config.ini.php" +ynh_add_config --template="config.ini.php" --destination="$install_dir/data/config.ini.php" # Load initial SQL into the new database -ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/webtrees.sql" +ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/webtrees.sql" # Replace variables in sql scripts ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql" @@ -63,7 +63,7 @@ ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --ta ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql" ynh_replace_string --match_string="__ADMIN_PASSWORD_HASHED__" --replace_string="$admin_password_hashed" --target_file="../conf/sql/admin.sql" -ynh_mysql_connect_as "$db_name" "$db_pwd" "$db_name" < "../conf/sql/admin.sql" +ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/admin.sql" #================================================= # END OF SCRIPT diff --git a/scripts/upgrade b/scripts/upgrade index b066dc8..dc41697 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -52,7 +52,7 @@ ynh_script_progression --message="Upgrading NGINX web server configuration..." ynh_add_nginx_config # Create a dedicated PHP-FPM config -ynh_add_fpm_config --usage=low --footprint=low +ynh_add_fpm_config #================================================= # END OF SCRIPT From 337a500923223322f39e42ca37d1810329085f90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 09:32:28 +0100 Subject: [PATCH 07/10] fix --- manifest.toml | 2 +- scripts/install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index f41c138..8cd3fbf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Webtrees" description.en = "Web-based genealogy application" description.fr = "Logiciel libre de généalogie en ligne" -version = "2.1.18~ynh1" +version = "2.1.18~ynh2" maintainers = [] diff --git a/scripts/install b/scripts/install index 6ccb81f..a26244d 100755 --- a/scripts/install +++ b/scripts/install @@ -55,7 +55,7 @@ ynh_add_fpm_config ynh_add_config --template="config.ini.php" --destination="$install_dir/data/config.ini.php" # Load initial SQL into the new database -ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/webtrees.sql" +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/webtrees.sql" # Replace variables in sql scripts ynh_replace_string --match_string="__USER_NAME__" --replace_string="$admin_username" --target_file="../conf/sql/admin.sql" @@ -63,7 +63,7 @@ ynh_replace_string --match_string="__NAME__" --replace_string="$admin_name" --ta ynh_replace_string --match_string="__USER_EMAIL__" --replace_string="$admin_email" --target_file="../conf/sql/admin.sql" ynh_replace_string --match_string="__ADMIN_PASSWORD_HASHED__" --replace_string="$admin_password_hashed" --target_file="../conf/sql/admin.sql" -ynh_mysql_connect_as --user="$db_name" "--password=$db_pwd" < "../conf/sql/admin.sql" +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/admin.sql" #================================================= # END OF SCRIPT From 6dd5ee301fb2f1af3b9907727474bf0085859307 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 8 Nov 2023 08:32:38 +0000 Subject: [PATCH 08/10] 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 5518e27..6c002e8 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Shipped version:** 2.1.18~ynh1 +**Shipped version:** 2.1.18~ynh2 **Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo diff --git a/README_fr.md b/README_fr.md index 98ba1dc..57e6ac5 100644 --- a/README_fr.md +++ b/README_fr.md @@ -23,7 +23,7 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive. -**Version incluse :** 2.1.18~ynh1 +**Version incluse :** 2.1.18~ynh2 **Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo From 05c9d80ddebcc6d1d9fd353abdb87efe3ddb6395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:08:02 +0100 Subject: [PATCH 09/10] cleaning --- scripts/upgrade | 1 - tests.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index dc41697..6cad7bc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -31,7 +31,6 @@ then # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir=$install_dir --keep="data modules_v4" - # restore data #cp -a ${install_dir}.old/data ${install_dir} diff --git a/tests.toml b/tests.toml index 998efbe..b867703 100644 --- a/tests.toml +++ b/tests.toml @@ -14,4 +14,4 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.dfcde24cce4db0527465acbc16dcecf9a3082858.name = "2.1.16" + #test_upgrade_from.dfcde24cce4db0527465acbc16dcecf9a3082858.name = "2.1.16" From a1f895bceae1348ec8ace110b7888d665744de2a Mon Sep 17 00:00:00 2001 From: YunoHost Bot Date: Mon, 17 Jun 2024 21:48:50 +0200 Subject: [PATCH 10/10] Upgrade to v2.1.20 (#89) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to v2.1.20 * Auto-update READMEs * fix * Auto-update READMEs --------- Co-authored-by: Éric Gaspar <46165813+ericgaspar@users.noreply.github.com> --- ALL_README.md | 8 +++++++ README.md | 28 ++++++++++++------------ README_es.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++++-------------- README_gl.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++ manifest.toml | 8 +++---- scripts/backup | 6 +----- scripts/restore | 14 ++++++------ scripts/upgrade | 23 ++------------------ 11 files changed, 272 insertions(+), 67 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..152f2e7 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lea el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 6c002e8..181dbf5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Webtrees quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Webtrees quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -24,9 +24,9 @@ Webtrees allows you to view and edit your genealogy on your website. It has full **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. -**Shipped version:** 2.1.18~ynh2 +**Shipped version:** 2.1.20~ynh1 -**Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo +**Demo:** ## Screenshots @@ -34,19 +34,19 @@ Webtrees allows you to view and edit your genealogy on your website. It has full ## Documentation and resources -* Official app website: -* Official admin documentation: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Official admin documentation: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug or sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..f235a08 --- /dev/null +++ b/README_es.md @@ -0,0 +1,55 @@ + + +# Webtrees para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) + +[![Instalar Webtrees con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarWebtrees rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + +Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. + +- It works from standard GEDCOM files, and is therefore compatible with every major desktop application. +- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. + +**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. + + +**Versión actual:** 2.1.20~ynh1 + +**Demo:** + +## Capturas + +![Captura de Webtrees](./doc/screenshots/1200px-Webtrees.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +o +sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..493a838 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,55 @@ + + +# Webtrees YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) + +[![Instalatu Webtrees YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Webtrees YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. + +- It works from standard GEDCOM files, and is therefore compatible with every major desktop application. +- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. + +**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. + + +**Paketatutako bertsioa:** 2.1.20~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Webtrees(r)en pantaila-argazkia](./doc/screenshots/1200px-Webtrees.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Administratzaileen dokumentazio ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +edo +sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 57e6ac5..90b3434 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Webtrees pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Webtrees avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Webtrees rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Webtrees rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -23,9 +23,9 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s **Remarque :** Il est préférable de mettre à niveau à partir du panneau d'administration Webtrees lorsqu'une nouvelle version arrive. -**Version incluse :** 2.1.18~ynh2 +**Version incluse :** 2.1.20~ynh1 -**Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo +**Démo :** ## Captures d’écran @@ -33,22 +33,22 @@ Webtrees vous permet de visualiser et de modifier votre généalogie sur votre s ## Documentations et ressources -* Site officiel de l’app : -* Documentation officielle de l’admin : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Documentation officielle de l’admin : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug ou sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..5122a28 --- /dev/null +++ b/README_gl.md @@ -0,0 +1,55 @@ + + +# Webtrees para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) + +[![Instalar Webtrees con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Webtrees de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. + +- It works from standard GEDCOM files, and is therefore compatible with every major desktop application. +- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. + +**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. + + +**Versión proporcionada:** 2.1.20~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Webtrees](./doc/screenshots/1200px-Webtrees.png) + +## Documentación e recursos + +- Web oficial da app: +- Documentación oficial para admin: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +ou +sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..6c9ead5 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,55 @@ + + +# YunoHost 上的 Webtrees + +[![集成程度](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![工作状态](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg) + +[![使用 YunoHost 安装 Webtrees](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Webtrees。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set. + +- It works from standard GEDCOM files, and is therefore compatible with every major desktop application. +- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards. + +**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives. + + +**分发版本：** 2.1.20~ynh1 + +**演示：** + +## 截图 + +![Webtrees 的截图](./doc/screenshots/1200px-Webtrees.png) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +或 +sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** diff --git a/manifest.toml b/manifest.toml index 8cd3fbf..1f159a8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Webtrees" description.en = "Web-based genealogy application" description.fr = "Logiciel libre de généalogie en ligne" -version = "2.1.18~ynh2" +version = "2.1.20~ynh1" maintainers = [] @@ -60,8 +60,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://github.com/fisharebest/webtrees/releases/download/2.1.18/webtrees-2.1.18.zip" - sha256 = "33808c8c39df9ff6120ddf55741638bb0287c6617527157abe8786aaa7c30ea2" + url = "https://github.com/fisharebest/webtrees/releases/download/2.1.20/webtrees-2.1.20.zip" + sha256 = "0e2f9ccf601e5d4579ef90d727b1630620bc22b9ef66c4aacbaf7329b3c7b49d" autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -72,7 +72,7 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "mariadb-server, php8.2-mbstring, php8.2-mysql, php8.2-zip, php8.2-gd, php8.2-xml, php8.2-curl, php8.2-intl, mailutils" + packages = "mariadb-server, php8.3-mbstring, php8.3-mysql, php8.3-zip, php8.3-gd, php8.3-xml, php8.3-curl, php8.3-intl, mailutils" [resources.database] type = "mysql" diff --git a/scripts/backup b/scripts/backup index eda99fe..9f67fa7 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,15 +21,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/restore b/scripts/restore index 3740315..ae3bef1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -19,6 +19,13 @@ ynh_restore_file --origin_path="$install_dir" chmod -R o-rwx "$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE MYSQL DATABASE +#================================================= +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 + +ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql + #================================================= # RESTORE THE PHP-FPM CONFIGURATION #================================================= @@ -28,13 +35,6 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# RESTORE THE MYSQL DATABASE -#================================================= -ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - -ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql - #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6cad7bc..a843cc3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,12 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# CHECK VERSION -#================================================= - -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # CHECK THE PATH #================================================= @@ -22,21 +16,8 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= ynh_script_progression --message="Upgrading source files..." -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." - # Move old app dir - #mv ${install_dir} ${install_dir}.old - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$install_dir --keep="data modules_v4" - - # restore data - #cp -a ${install_dir}.old/data ${install_dir} - - # delete temp directory - #ynh_secure_remove --file=${install_dir}.old -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir=$install_dir --keep="data modules_v4" chmod -R 700 $install_dir/data chmod -R o-rwx "$install_dir"