From 0eb00a78b9fdc1c956f42b6192ac5b7540e9b447 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com> Date: Thu, 2 May 2024 03:25:45 +0200 Subject: [PATCH 1/7] Update manifest.toml: add explicit dependency to rsync --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f6f3315..35688af 100644 --- a/manifest.toml +++ b/manifest.toml @@ -66,7 +66,7 @@ ram.runtime = "50M" main.default = 22300 [resources.apt] - packages = "postgresql, postgresql-client, python3-bcrypt" + packages = "postgresql, postgresql-client, python3-bcrypt, rsync" extras.yarn.repo = "deb https://dl.yarnpkg.com/debian/ stable main" extras.yarn.key = "https://dl.yarnpkg.com/debian/pubkey.gpg" extras.yarn.packages = "yarn" From 837b6976e3eb53741d8dfce4d7afbf462b72299f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 22:02:55 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..8938aae 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Lee 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) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..8198f26 --- /dev/null +++ b/README_es.md @@ -0,0 +1,47 @@ + + +# Joplin para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/joplin.svg)](https://dash.yunohost.org/appci/app/joplin) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/joplin.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/joplin.maintain.svg) + +[![Instalar Joplin con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=joplin) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarJoplin 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 + +Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. + +**Versión actual:** 3.0.6~ynh1 + +## Capturas + +![Captura de Joplin](./doc/screenshots/screenshot.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/joplin_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/joplin_ynh/tree/testing --debug +o +sudo yunohost app upgrade joplin -u https://github.com/YunoHost-Apps/joplin_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 359b42c..6f1935d 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Joplin +# YunoHost 上的 Joplin [![集成程度](https://dash.yunohost.org/integration/joplin.svg)](https://dash.yunohost.org/appci/app/joplin) ![工作状态](https://ci-apps.yunohost.org/ci/badges/joplin.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/joplin.maintain.svg) From af0eb917adbc7102855f17a27924abd4f431b33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 13 May 2024 00:05:58 +0200 Subject: [PATCH 3/7] cleaning --- scripts/backup | 6 +----- scripts/install | 6 +++--- scripts/upgrade | 32 ++++++++++++-------------------- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/scripts/backup b/scripts/backup index f11e868..031dabc 100755 --- a/scripts/backup +++ b/scripts/backup @@ -22,15 +22,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 SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= diff --git a/scripts/install b/scripts/install index 4e03f33..aea699d 100755 --- a/scripts/install +++ b/scripts/install @@ -69,9 +69,9 @@ ynh_script_progression --message="Building $app..." --weight=10 pushd $install_dir/packages/server ynh_use_nodejs - sudo -u $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds - sudo -u $app env $ynh_node_load_PATH yarn build - sudo -u $app env $ynh_node_load_PATH yarn cache clean + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean ynh_secure_remove .yarn/berry popd diff --git a/scripts/upgrade b/scripts/upgrade index 57185a6..6290422 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,8 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STOP SYSTEMD SERVICE #================================================= @@ -23,14 +21,10 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - # Download, check integrity, uncompress and patch the source from manifest.toml - ynh_setup_source --dest_dir="$install_dir" --keep=".env" -fi +# Download, check integrity, uncompress and patch the source from manifest.toml +ynh_setup_source --dest_dir="$install_dir" --keep=".env" chown -R $app:www-data "$install_dir" @@ -45,18 +39,16 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version #================================================= # BUILD #================================================= +ynh_script_progression --message="Building $app..." --weight=10 + +pushd $install_dir/packages/server + ynh_use_nodejs + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cache clean + ynh_secure_remove .yarn/berry +popd -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Building $app..." --weight=10 - pushd $install_dir/packages/server - ynh_use_nodejs - sudo -u $app env $ynh_node_load_PATH BUILD_SEQUENCIAL=1 yarn install --inline-builds - sudo -u $app env $ynh_node_load_PATH yarn build - sudo -u $app env $ynh_node_load_PATH yarn cache clean - ynh_secure_remove .yarn/berry - popd -fi #================================================= # REAPPLY SYSTEM CONFIGURATIONS From 0b75e93f95befeeffb3683fce107195be9bfa746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 21 May 2024 12:30:31 +0200 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 35688af..46aa303 100644 --- a/manifest.toml +++ b/manifest.toml @@ -26,9 +26,9 @@ ldap = false sso = false -disk = "50M" -ram.build = "50M" -ram.runtime = "50M" +disk = "6G" +ram.build = "5G" +ram.runtime = "280M" [install] [install.domain] From 3e2f3a1ba37c8298beaf97c9a1d98e48fc1a5767 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 May 2024 10:30:36 +0000 Subject: [PATCH 5/7] Auto-update READMEs --- ALL_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.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) From 276210893f28db29833b5b18082ee796dd20e185 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 21 May 2024 17:33:28 +0200 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 46aa303..dd450c2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Joplin" description.en = "Note taking and to-do application with synchronisation capabilities" description.fr = "Application de prise de notes et de tâches avec capacités de synchronisation" -version = "3.0.6~ynh1" +version = "3.0.6~ynh2" maintainers = ["eric_G"] From 892b299dca992da9fd642d6baa47b18ffcd3110e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 21 May 2024 15:33:33 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8c6f35e..18e3cef 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ It shall NOT be edited by hand. Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Shipped version:** 3.0.6~ynh1 +**Shipped version:** 3.0.6~ynh2 ## Screenshots diff --git a/README_es.md b/README_es.md index 8198f26..e13c599 100644 --- a/README_es.md +++ b/README_es.md @@ -18,7 +18,7 @@ No se debe editar a mano. Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Versión actual:** 3.0.6~ynh1 +**Versión actual:** 3.0.6~ynh2 ## Capturas diff --git a/README_eu.md b/README_eu.md index c82944c..08c2159 100644 --- a/README_eu.md +++ b/README_eu.md @@ -18,7 +18,7 @@ EZ editatu eskuz. Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Paketatutako bertsioa:** 3.0.6~ynh1 +**Paketatutako bertsioa:** 3.0.6~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 7ebed29..5bb5f8a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Joplin est une application gratuite et open source de prise de notes et de tâches, qui peut gérer un grand nombre de notes organisées dans des cahiers. Les notes sont consultables, peuvent être copiées, étiquetées et modifiées directement depuis les applications ou depuis votre propre éditeur de texte. Les notes sont au format Markdown. -**Version incluse :** 3.0.6~ynh1 +**Version incluse :** 3.0.6~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 02cfc40..a960a44 100644 --- a/README_gl.md +++ b/README_gl.md @@ -18,7 +18,7 @@ NON debe editarse manualmente. Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**Versión proporcionada:** 3.0.6~ynh1 +**Versión proporcionada:** 3.0.6~ynh2 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6f1935d..b6bf76a 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -18,7 +18,7 @@ Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format. -**分发版本：** 3.0.6~ynh1 +**分发版本：** 3.0.6~ynh2 ## 截图