diff --git a/README.md b/README.md index e935ead..2167c52 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,9 @@ 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 +**Shipped version:** 3.0.9~ynh2 ## Screenshots diff --git a/README_es.md b/README_es.md index ac3eea0..0a1483c 100644 --- a/README_es.md +++ b/README_es.md @@ -16,9 +16,9 @@ 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 +**Versión actual:** 3.0.9~ynh2 ## Capturas diff --git a/README_eu.md b/README_eu.md index 159e55c..ef8cab6 100644 --- a/README_eu.md +++ b/README_eu.md @@ -16,9 +16,9 @@ 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 +**Paketatutako bertsioa:** 3.0.9~ynh2 ## Pantaila-argazkiak diff --git a/README_fr.md b/README_fr.md index 14991dc..5fecbad 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,9 +16,9 @@ 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 +**Version incluse :** 3.0.9~ynh2 ## Captures d’écran diff --git a/README_gl.md b/README_gl.md index 3fc0f56..7a22a71 100644 --- a/README_gl.md +++ b/README_gl.md @@ -16,9 +16,9 @@ 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 +**Versión proporcionada:** 3.0.9~ynh2 ## Capturas de pantalla diff --git a/README_zh_Hans.md b/README_zh_Hans.md index aa9f333..17850e8 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -16,9 +16,9 @@ ## 概况 -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 +**分发版本：** 3.0.9~ynh2 ## 截图 diff --git a/conf/systemd.service b/conf/systemd.service index 541af5e..559ff9c 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,6 @@ Group=__APP__ Environment="__YNH_NODE_LOAD_PATH__" EnvironmentFile=__INSTALL_DIR__/.env - WorkingDirectory=__INSTALL_DIR__/ ExecStart=/usr/bin/yarn __INSTALL_DIR__/packages/server start diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 9a219a3..75c76a2 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 0d51b1f..3321ebf 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md new file mode 100644 index 0000000..7600187 --- /dev/null +++ b/doc/POST_INSTALL_fr.md @@ -0,0 +1,8 @@ +Connectez-vous maintenant à Joplin + - URL : https://__DOMAIN____PATH__ + - E-mail : __ADMIN_MAIL__ + - Mot de passe : __ADMIN_PASS__ + +Ensuite, vous pouvez modifier le mot de passe par défaut sur cette page : https://__DOMAIN____PATH__/admin/users + +Téléchargez ensuite l'une de ces applications Joplin et configurez la synchronisation avec votre serveur : https://joplinapp.org/help/install/ \ No newline at end of file diff --git a/manifest.toml b/manifest.toml index 40b20af..0bf6dfe 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.9~ynh1" +version = "3.0.9~ynh2" maintainers = ["eric_G"] @@ -67,6 +67,7 @@ ram.runtime = "280M" [resources.apt] 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" 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 diff --git a/scripts/upgrade b/scripts/upgrade index 6290422..d5d5715 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,7 +49,6 @@ pushd $install_dir/packages/server ynh_secure_remove .yarn/berry popd - #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================