From d7b04e5efb506d3a5a89f92bcd15fc9efe51eaa5 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 13 Jun 2024 07:22:34 +0000 Subject: [PATCH 1/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 e935ead..51d1a30 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ It shall NOT be edited by hand. ## Overview -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. +Joplin server is a 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.9~ynh1 diff --git a/README_es.md b/README_es.md index ac3eea0..d61b23d 100644 --- a/README_es.md +++ b/README_es.md @@ -16,7 +16,7 @@ No se debe editar a mano. ## 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. +Joplin server is a 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.9~ynh1 diff --git a/README_eu.md b/README_eu.md index 159e55c..661e9e8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -16,7 +16,7 @@ EZ editatu eskuz. ## Aurreikuspena -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. +Joplin server is a 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.9~ynh1 diff --git a/README_fr.md b/README_fr.md index 14991dc..4fc01e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ Il NE doit PAS être modifié à la main. ## Vue d’ensemble -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. +Joplin server est une application 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.9~ynh1 diff --git a/README_gl.md b/README_gl.md index 3fc0f56..04161a9 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,7 +16,7 @@ NON debe editarse manualmente. ## Vista xeral -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. +Joplin server is a 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.9~ynh1 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index aa9f333..b9116c2 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -16,7 +16,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. +Joplin server is a 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.9~ynh1 From 6a9e43b6fed55e2730f54eff490ee8151c883bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:25:23 +0200 Subject: [PATCH 2/7] data_dir --- conf/.env | 7 +++++++ manifest.toml | 2 ++ 2 files changed, 9 insertions(+) diff --git a/conf/.env b/conf/.env index 3f4397d..7ed8ffe 100644 --- a/conf/.env +++ b/conf/.env @@ -23,3 +23,10 @@ MAILER_AUTH_USER=__APP__ MAILER_AUTH_PASSWORD=__MAIL_PWD__ MAILER_NOREPLY_NAME=__APP__ MAILER_NOREPLY_EMAIL=reply@__DOMAIN__ + +STORAGE_DRIVER=Type=Filesystem; Path=__DATA_DIR__ +STORAGE_DRIVER_FALLBACK=Type=Database; Mode=ReadAndWrite + +# In ReadAndClear mode, it's going to clear the fallback driver content every time an item is moved to the main driver. It means that over time the old storage will be cleared and all content will be on the new storage. +#STORAGE_DRIVER_FALLBACK=Type=Database; Mode=ReadAndClear + diff --git a/manifest.toml b/manifest.toml index 40b20af..55157ac 100644 --- a/manifest.toml +++ b/manifest.toml @@ -55,6 +55,8 @@ ram.runtime = "280M" [resources.install_dir] + [resources.data_dir] + [resources.permissions] main.url = "/" api.url = "/api" From 975c8952c44d00a63e7602f83bbabbf961249170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:26:59 +0200 Subject: [PATCH 3/7] add data dir --- scripts/backup | 6 ++++++ scripts/restore | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/scripts/backup b/scripts/backup index 031dabc..15bda74 100755 --- a/scripts/backup +++ b/scripts/backup @@ -21,6 +21,12 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" +#================================================= +# BACKUP THE DATA DIR +#================================================= + +ynh_backup --src_path="$data_dir" --is_big + #================================================= # SYSTEM CONFIGURATION #================================================= diff --git a/scripts/restore b/scripts/restore index c9b4674..49c4964 100755 --- a/scripts/restore +++ b/scripts/restore @@ -19,6 +19,15 @@ ynh_restore_file --origin_path="$install_dir" chown -R $app:www-data "$install_dir" +#================================================= +# RESTORE THE DATA DIRECTORY +#================================================= +ynh_script_progression --message="Restoring the data directory..." --weight=1 + +ynh_restore_file --origin_path="$data_dir" --not_mandatory + +chown -R "$app:www-data" "$data_dir" + #================================================= # RESTORE THE PostgreSQL DATABASE #================================================= From 736055fcb039d447bd73c72342dd5f82fe71db3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:35:54 +0200 Subject: [PATCH 4/7] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index aea699d..b13ebad 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 - 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_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production BUILD_SEQUENCIAL=1 yarn install --inline-builds + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn cache clean ynh_secure_remove .yarn/berry popd From d1086dc7c878085f765df542de66bb5b6a71072e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:42:11 +0200 Subject: [PATCH 5/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 862e7c0..c661840 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=22 +nodejs_version=18 #================================================= # PERSONAL HELPERS From 052414507afd214c44b72618995f900f0488cd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:02:58 +0200 Subject: [PATCH 6/7] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index c661840..38a471e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=18 +nodejs_version=20 #================================================= # PERSONAL HELPERS From 51bd9427157eff006f85905d29920ebb0878ec7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 13 Jun 2024 14:23:46 +0200 Subject: [PATCH 7/7] Update .env --- conf/.env | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/.env b/conf/.env index 7ed8ffe..8a55343 100644 --- a/conf/.env +++ b/conf/.env @@ -25,8 +25,3 @@ MAILER_NOREPLY_NAME=__APP__ MAILER_NOREPLY_EMAIL=reply@__DOMAIN__ STORAGE_DRIVER=Type=Filesystem; Path=__DATA_DIR__ -STORAGE_DRIVER_FALLBACK=Type=Database; Mode=ReadAndWrite - -# In ReadAndClear mode, it's going to clear the fallback driver content every time an item is moved to the main driver. It means that over time the old storage will be cleared and all content will be on the new storage. -#STORAGE_DRIVER_FALLBACK=Type=Database; Mode=ReadAndClear -