From 874a74850ad4a9cb99c587f39f652c4b7093ded1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:34:03 +0100 Subject: [PATCH 01/68] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5a807cd..49ce555 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.1~ynh2" +version = "1.9.4~ynh1" maintainers = [] @@ -80,8 +80,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.9.1.tar.gz" - sha256 = "667741235a2bcd8d28a32f5e611b82fb2ea7d11525ff41b8b5478b05a987b047" + url = "https://github.com/ether/etherpad-lite/archive/1.9.4.tar.gz" + sha256 = "5b8ccf2a3c92cbd9bb578f684bc52d2ea27fc3fb30cdc76341f9ccffe0c0ff7f" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 5f5f5ac30bfe5de5d197f6f3a1132feefaa6d722 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 11 Dec 2023 15:34:08 +0000 Subject: [PATCH 02/68] 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 9ecb1e9..1b5993f 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.9.1~ynh2 +**Shipped version:** 1.9.4~ynh1 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 4446326..3837642 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.1~ynh2 +**Version incluse :** 1.9.4~ynh1 **Démo :** https://video.etherpad.com From 16ea0364fce9cb3bd6e330a6acd5009c2dcd9535 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 11 Dec 2023 17:09:43 +0100 Subject: [PATCH 03/68] Forgot to move to the appropriate workdir before running npm command >_> --- scripts/upgrade | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index de234d8..9984f99 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -148,12 +148,14 @@ if ynh_compare_current_package_version --comparison lt --version 1.9.1~ynh2 then if ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ls 2>/dev/null | grep -q ep_table_of_contents then - ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=90 - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents + ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=2 + pushd "$install_dir" + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents + popd fi fi -ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 +ynh_script_progression --message="Installing Etherpad plugins..." --weight=10 pushd "$install_dir" # Add Left/Center/Right/Justify to lines of text in a pad From 4e2e8f7d96bfc0bf7a04d44c2f132e7340a6cbfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Dec 2023 10:41:06 +0100 Subject: [PATCH 04/68] Update tests.toml --- tests.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.toml b/tests.toml index 3d73345..239456b 100644 --- a/tests.toml +++ b/tests.toml @@ -17,7 +17,7 @@ test_format = 1.0 # Commits to test upgrade from # ------------------------------- - test_upgrade_from.4d613658.name = "1.8.17" + test_upgrade_from.4e8049b31708b9f0223ee1a6ca8f153f04ec7e40.name = "1.9.1" [with_mypads] From 174ed5b173949d139e880304db0c0f45e0854ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 23 Dec 2023 10:43:06 +0100 Subject: [PATCH 05/68] Update manifest.toml --- manifest.toml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 49ce555..0cef831 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.4~ynh1" +version = "1.9.5~ynh1" maintainers = [] @@ -20,8 +20,11 @@ code = "https://github.com/ether/etherpad-lite" yunohost = ">= 11.2" architectures = ["arm64", "amd64"] multi_instance = true + ldap = false + sso = false + disk = "50M" ram.build = "1500M" ram.runtime = "50M" @@ -80,8 +83,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.9.4.tar.gz" - sha256 = "5b8ccf2a3c92cbd9bb578f684bc52d2ea27fc3fb30cdc76341f9ccffe0c0ff7f" + url = "https://github.com/ether/etherpad-lite/archive/1.9.5.tar.gz" + sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 80a853a1aa7944686fad35d43226e6fdd697e14b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 23 Dec 2023 09:43:17 +0000 Subject: [PATCH 06/68] 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 1b5993f..cfbbb67 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.9.4~ynh1 +**Shipped version:** 1.9.5~ynh1 **Demo:** https://video.etherpad.com diff --git a/README_fr.md b/README_fr.md index 3837642..e6bf03c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.4~ynh1 +**Version incluse :** 1.9.5~ynh1 **Démo :** https://video.etherpad.com From 9e8a2adda40e83fd3dd10a000a5f85e1934d9241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 14 Jan 2024 20:00:14 +0100 Subject: [PATCH 07/68] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 0cef831..5283dec 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,7 +25,7 @@ ldap = false sso = false -disk = "50M" +disk = "200M" ram.build = "1500M" ram.runtime = "50M" From c5605c825dc54826b4560b108d1c1557fd056ddc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Apr 2024 03:32:54 +0200 Subject: [PATCH 08/68] Upgrade to v2.0.2 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5283dec..c6a2fd4 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.5~ynh1" +version = "2.0.2~ynh1" maintainers = [] @@ -83,8 +83,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.9.5.tar.gz" - sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.2.tar.gz" + sha256 = "5b5e47dbe7b07c3cafd8830780408f25141231b62f44ce9aa066329ed3223b4e" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 00b631a9e41f987b37296be4ac3f3e89649b2dc2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Apr 2024 01:32:58 +0000 Subject: [PATCH 09/68] Auto-update READMEs --- ALL_README.md | 7 +++++ README.md | 28 ++++++++++---------- README_eu.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 32 +++++++++++------------ README_gl.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 232 insertions(+), 30 deletions(-) create mode 100644 ALL_README.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..a01b345 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,7 @@ +# All available README files by language + +- [Read the README in English](README.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 cfbbb67..2a8f95d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Etherpad MyPads with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Etherpad MyPads 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 Etherpad MyPads 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 @@ -34,9 +34,9 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.9.5~ynh1 +**Shipped version:** 2.0.2~ynh1 -**Demo:** https://video.etherpad.com +**Demo:** ## Screenshots @@ -44,19 +44,19 @@ This version of Etherpad is preconfigured with a collection of plugins: ## 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/etherpad_mypads_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/etherpad_mypads_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/etherpad_mypads_ynh/tree/testing --debug or sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..eac09cf --- /dev/null +++ b/README_eu.md @@ -0,0 +1,65 @@ + + +# Etherpad MyPads YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![Instalatu Etherpad MyPads YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Etherpad MyPads YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**Paketatutako bertsioa:** 2.0.2~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Etherpad MyPads(r)en pantaila-argazkia](./doc/screenshots/etherpad_demo.gif) + +## 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/etherpad_mypads_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +edo +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index e6bf03c..25a548f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Etherpad MyPads pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Etherpad MyPads avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Etherpad MyPads 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 Etherpad MyPads 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 @@ -34,9 +34,9 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.5~ynh1 +**Version incluse :** 2.0.2~ynh1 -**Démo :** https://video.etherpad.com +**Démo :** ## Captures d’écran @@ -44,22 +44,22 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: ## 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/etherpad_mypads_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/etherpad_mypads_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/etherpad_mypads_ynh/tree/testing --debug ou sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_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..feddedd --- /dev/null +++ b/README_gl.md @@ -0,0 +1,65 @@ + + +# Etherpad MyPads para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![Instalar Etherpad MyPads con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Etherpad MyPads 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 + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**Versión proporcionada:** 2.0.2~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Etherpad MyPads](./doc/screenshots/etherpad_demo.gif) + +## 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/etherpad_mypads_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +ou +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_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..a5804eb --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,65 @@ + + +# YunoHost 的 Etherpad MyPads + +[![集成程度](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![使用 YunoHost 安装 Etherpad MyPads](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Etherpad MyPads。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**分发版本：** 2.0.2~ynh1 + +**演示：** + +## 截图 + +![Etherpad MyPads 的截图](./doc/screenshots/etherpad_demo.gif) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +或 +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From a368cc1b81ef68421027e4e56dce48aadca73674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:53:45 +0200 Subject: [PATCH 10/68] intall pnpm --- conf/systemd.service | 2 +- scripts/install | 3 ++- scripts/upgrade | 15 +++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 0684052..4808e55 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ Environment=ETHERPAD_PRODUCTION=true Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__YNH_NODE__ __INSTALL_DIR__/src/node/server.js +ExecStart=__INSTALL_DIR__/bin/run.sh StandardOutput=append:/var/log/__APP__/etherpad.log StandardError=inherit Restart=always diff --git a/scripts/install b/scripts/install index c239422..8a6bc5f 100644 --- a/scripts/install +++ b/scripts/install @@ -130,7 +130,8 @@ popd ynh_script_progression --message="Installing Etherpad..." --weight=90 pushd $install_dir - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh + ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index be9c68f..90f1f20 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -3,8 +3,6 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # ACTIVATE MAINTENANCE MODE #================================================= @@ -67,14 +65,10 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=4 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=4 - - # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json" -fi +# Download, check integrity, uncompress and patch the source from app.src +ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" @@ -192,7 +186,8 @@ popd ynh_script_progression --message="Upgrading Etherpad..." --weight=10 pushd $install_dir - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true src/bin/installDeps.sh + ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd #================================================= From 3231d34bd03dbe7a1aedb2c669dab22b93d0386a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:54:20 +0200 Subject: [PATCH 11/68] update node --- manifest.toml | 2 +- scripts/_common.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index c6a2fd4..8cd8400 100644 --- a/manifest.toml +++ b/manifest.toml @@ -115,4 +115,4 @@ ram.runtime = "50M" [resources.database] type = "mysql" - + \ No newline at end of file diff --git a/scripts/_common.sh b/scripts/_common.sh index d8e6290..3e08996 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # NodeJS version -nodejs_version=14 +nodejs_version=20 # MyPads version # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. From ba08a4a4d41e22c5b6c3764810640a2e589538e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 10:59:35 +0200 Subject: [PATCH 12/68] fix --- scripts/install | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/scripts/install b/scripts/install index 8a6bc5f..af8960c 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,6 @@ then fi # Calculate and store the config file checksum into the app settings - ynh_add_config --template="settings.json" --destination="$install_dir/settings.json" ynh_add_config --template="credentials.json" --destination="$install_dir/credentials.json" @@ -93,43 +92,22 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD'S PLUGINS #================================================= -ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 +#ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 -pushd "$install_dir" - # Add Left/Center/Right/Justify to lines of text in a pad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_align@${ep_align_version} - # Framapad - Adds author names to span titles - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_author_hover@${ep_author_hover_version} - # Framapad - Adds comments on sidebar and link it to the text. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_comments_page@${ep_comments_page_version} - # Framapad - Displays paragraphs, sentences, words and characters counts. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_countable@${ep_countable_version} - # Framapad - Delete pads which were never edited - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_delete_empty_pads@${ep_delete_empty_pads_version} - # Framapad - Apply colors to fonts - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_color@${ep_font_color_version} - # Framapad - Adds heading support to Etherpad Lite. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_headings2@${ep_headings2_version} - # Framapad - Edit and Export as Markdown in Etherpad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_markdown@${ep_markdown_version} - if [ $mypads -eq 1 ]; then - # Framapad - Groups and private pads for Etherpad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_mypads@${mypads_version} - fi - # Framapad - Add support to do 'Spell checking' - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_spellcheck@${ep_spellcheck_version} - # Framapad - Add support for Subscript and Superscript - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_subscript_and_superscript@${ep_subscript_and_superscript_version} - # Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_size@${ep_font_size_version} -popd +#pushd "$install_dir" +# ynh_exec_warn_less npm install pnpm -g +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} +# if [ $mypads -eq 1 ]; then +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} +# fi +#popd #================================================= # INSTALL ETHERPAD #================================================= ynh_script_progression --message="Installing Etherpad..." --weight=90 -pushd $install_dir +pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd From d2a874a3f6b8fe3c7b03bd45a4500cba6983cb08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:43:10 +0200 Subject: [PATCH 13/68] fix --- scripts/restore | 7 ++++-- scripts/upgrade | 57 ++++++++++++++++--------------------------------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/scripts/restore b/scripts/restore index 78789ad..230ffe9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,6 @@ source /usr/share/yunohost/helpers #================================================= # RESTORE THE APP MAIN DIR #================================================= -# ynh_script_progression --message="Restoring the app main directory..." --weight=5 ynh_restore_file --origin_path="$install_dir" @@ -28,7 +27,11 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Restoring system configurations related to $app..." ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_use_nodejs + +pushd $install_dir + ynh_use_nodejs + ynh_exec_warn_less npm install pnpm -g +popd ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 90f1f20..8add392 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -68,7 +68,7 @@ ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \ ynh_script_progression --message="Upgrading source files..." --weight=4 # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json" +ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="settings.json credentials.json" chmod -R o-rwx "$install_dir" chown -R $app:$app "$install_dir" @@ -138,47 +138,26 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # If upgrading from an old version and table of content is there, remove it -if ynh_compare_current_package_version --comparison lt --version 1.9.1~ynh3 -then - pushd "$install_dir" - if ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ls 2>/dev/null | grep -q ep_table_of_contents - then - ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=2 - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents - fi - popd -fi +#if ynh_compare_current_package_version --comparison lt --version 1.9.1~ynh3 +#then +# pushd "$install_dir" +# if ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ls 2>/dev/null | grep -q ep_table_of_contents +# then +# ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=2 +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents +# fi +# popd +#fi ynh_script_progression --message="Installing Etherpad plugins..." --weight=10 -pushd "$install_dir" - # Add Left/Center/Right/Justify to lines of text in a pad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_align@${ep_align_version} - # Framapad - Adds author names to span titles - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_author_hover@${ep_author_hover_version} - # Framapad - Adds comments on sidebar and link it to the text. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_comments_page@${ep_comments_page_version} - # Framapad - Displays paragraphs, sentences, words and characters counts. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_countable@${ep_countable_version} - # Framapad - Delete pads which were never edited - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_delete_empty_pads@${ep_delete_empty_pads_version} - # Framapad - Apply colors to fonts - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_color@${ep_font_color_version} - # Framapad - Adds heading support to Etherpad Lite. - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_headings2@${ep_headings2_version} - # Framapad - Edit and Export as Markdown in Etherpad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_markdown@${ep_markdown_version} - if [ $mypads -eq 1 ]; then - # Framapad - Groups and private pads for Etherpad - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_mypads@${mypads_version} - fi - # Framapad - Add support to do 'Spell checking' - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_spellcheck@${ep_spellcheck_version} - # Framapad - Add support for Subscript and Superscript - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_subscript_and_superscript@${ep_subscript_and_superscript_version} - # Framapad - User Pad Contents font size can be set in settings, this does not effect other peoples views - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install --no-save ep_font_size@${ep_font_size_version} -popd +#pushd "$install_dir" +# ynh_exec_warn_less npm install pnpm -g +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} +# if [ $mypads -eq 1 ]; then +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} +# fi +#popd #================================================= # UPGRADE NPM MODULES From e9b3f3e0b309610d58faf53cd60527a55b5af5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:22:39 +0200 Subject: [PATCH 14/68] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 8add392..78133b8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -173,7 +173,7 @@ popd # ADD MYPADS LINK #================================================= -if [ "$upgrade_type" == "UPGRADE_APP" ] && [ $mypads -eq 1 ] +if [ $mypads -eq 1 ] then # Find the /div just after the field to open a pad in order to add a link to MyPads plugin. sed -i '157i

MyPads
' $install_dir/src/templates/index.html From fa764320876c65737cd40663b17358b2c69238eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:01:39 +0200 Subject: [PATCH 15/68] Update upgrade --- scripts/upgrade | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 78133b8..c5fe695 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -101,8 +101,7 @@ chown $app -R /var/log/$app #================================================= # CONFIGURE ETHERPAD #================================================= - -ynh_script_progression --message="Configure etherpad..." +ynh_script_progression --message="Configure $app..." abiword_path="null" soffice_path="null" @@ -149,7 +148,7 @@ chown $app:$app "$install_dir/credentials.json" # popd #fi -ynh_script_progression --message="Installing Etherpad plugins..." --weight=10 +#ynh_script_progression --message="Installing Etherpad plugins..." --weight=10 #pushd "$install_dir" # ynh_exec_warn_less npm install pnpm -g From 5e2871f905c5300521c317476fe20c710d46d7c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 15:28:30 +0200 Subject: [PATCH 16/68] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c5fe695..5c5e8c9 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -161,7 +161,7 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # UPGRADE NPM MODULES #================================================= -ynh_script_progression --message="Upgrading Etherpad..." --weight=10 +ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir ynh_exec_warn_less npm install pnpm -g From 1d898683ee32ccfc23a0d804a3744d381f8987cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:23:47 +0200 Subject: [PATCH 17/68] Update install --- scripts/install | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index af8960c..232b717 100644 --- a/scripts/install +++ b/scripts/install @@ -92,22 +92,20 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD'S PLUGINS #================================================= -#ynh_script_progression --message="Installing Etherpad plugins..." --weight=90 +ynh_script_progression --message="Installing $app plugins..." --weight=90 -#pushd "$install_dir" -# ynh_exec_warn_less npm install pnpm -g -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} -# if [ $mypads -eq 1 ]; then -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} -# fi -#popd +pushd "$install_dir" + ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} + if [ $mypads -eq 1 ]; then + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} + fi #================================================= # INSTALL ETHERPAD #================================================= -ynh_script_progression --message="Installing Etherpad..." --weight=90 +ynh_script_progression --message="Installing $app..." --weight=90 -pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd From 743262704b0b0e3aac639c10c11bdce6bb45026e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:38:18 +0200 Subject: [PATCH 18/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 232b717..71594cf 100644 --- a/scripts/install +++ b/scripts/install @@ -96,7 +96,7 @@ ynh_script_progression --message="Installing $app plugins..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} fi From 89409c1af1ab8026f00ccb7af7ea5ff000434e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 11 Apr 2024 18:38:51 +0200 Subject: [PATCH 19/68] Update install --- scripts/install | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 71594cf..4014726 100644 --- a/scripts/install +++ b/scripts/install @@ -92,20 +92,22 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD'S PLUGINS #================================================= -ynh_script_progression --message="Installing $app plugins..." --weight=90 +#ynh_script_progression --message="Installing $app plugins..." --weight=90 -pushd "$install_dir" - ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} - if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} - fi +#pushd "$install_dir" +# ynh_exec_warn_less npm install pnpm -g +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} +# if [ $mypads -eq 1 ]; then +# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} +# fi +#popd #================================================= # INSTALL ETHERPAD #================================================= ynh_script_progression --message="Installing $app..." --weight=90 +pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd From 4233209e56e09646ec2548ca1275a749a9492b98 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 24 Apr 2024 12:50:11 +0000 Subject: [PATCH 20/68] Auto-update READMEs --- ALL_README.md | 3 ++- README.md | 2 +- README_eu.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 README_eu.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md index 3d6c579..a01b345 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) +- [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md) -- [Leggi il “README” in italiano](README_it.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index 51885fd..dee75b2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ It shall NOT be edited by hand. [![Install Etherpad MyPads with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) -*[Read this README is other languages.](./ALL_README.md)* +*[Read this README in other languages.](./ALL_README.md)* > *This package allows you to install Etherpad MyPads 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.* diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..38113e6 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,65 @@ + + +# Etherpad MyPads YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![Instalatu Etherpad MyPads YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Etherpad MyPads YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**Paketatutako bertsioa:** 1.9.5~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Etherpad MyPads(r)en pantaila-argazkia](./doc/screenshots/etherpad_demo.gif) + +## 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/etherpad_mypads_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +edo +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index c5c5cb3..1e682e4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.5~ynh1 +**Version incluse :** 1.9.5~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index b296f95..cd62dff 100644 --- a/README_gl.md +++ b/README_gl.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Versión proporcionada:** 1.9.1~ynh3 +**Versión proporcionada:** 1.9.5~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..1317d79 --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,65 @@ + + +# YunoHost 的 Etherpad MyPads + +[![集成程度](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![使用 YunoHost 安装 Etherpad MyPads](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Etherpad MyPads。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**分发版本：** 1.9.5~ynh1 + +**演示：** + +## 截图 + +![Etherpad MyPads 的截图](./doc/screenshots/etherpad_demo.gif) + +## 文档与资源 + +- 官方应用网站： +- 官方管理文档： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +或 +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From c43368309582b4be095a57e684fcfaef8eea943a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Apr 2024 03:32:31 +0200 Subject: [PATCH 21/68] Upgrade to v2.0.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5283dec..a0eb9a6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.5~ynh1" +version = "2.0.3~ynh1" maintainers = [] @@ -83,8 +83,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.9.5.tar.gz" - sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz" + sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 1515f1e3659be347af993956ea5bcf29e8b1ae74 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 30 Apr 2024 01:32:35 +0000 Subject: [PATCH 22/68] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index dee75b2..f2947b3 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.9.5~ynh1 +**Shipped version:** 2.0.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 38113e6..1222bf6 100644 --- a/README_eu.md +++ b/README_eu.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Paketatutako bertsioa:** 1.9.5~ynh1 +**Paketatutako bertsioa:** 2.0.3~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 1e682e4..eccca6d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.5~ynh1 +**Version incluse :** 2.0.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index cd62dff..4decc8a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Versión proporcionada:** 1.9.5~ynh1 +**Versión proporcionada:** 2.0.3~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1317d79..6113e6f 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**分发版本：** 1.9.5~ynh1 +**分发版本：** 2.0.3~ynh1 **演示：** From 2aa0a46e8e15b13462ec32eb78690698da8f7718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 18:48:48 +0200 Subject: [PATCH 23/68] Update settings.json --- conf/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/settings.json b/conf/settings.json index d51e36c..97c6d68 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -434,7 +434,7 @@ __COMMENT_IF_LDAP_DISABLED__ }, /* * Restrict socket.io transport methods */ - "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"], + "socketTransportProtocols" : ["websocket", "polling"], "socketIo": { /* From c1369d603db61f14005b211d037875151bceb11b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 9 May 2024 16:48:53 +0000 Subject: [PATCH 24/68] Auto-update READMEs --- README_zh_Hans.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a5804eb..707ada1 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Etherpad MyPads +# YunoHost 上的 Etherpad MyPads [![集成程度](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) From f55f45c1b981b7ae3d577bb33543ddf7f4ec9510 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 9 May 2024 16:51:43 +0000 Subject: [PATCH 25/68] Auto-update READMEs --- README_zh_Hans.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6113e6f..64fb05e 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Etherpad MyPads +# YunoHost 上的 Etherpad MyPads [![集成程度](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) From 2512835e95e9319cccb27ead135360e8b75a6c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 18:55:28 +0200 Subject: [PATCH 26/68] Update install --- scripts/install | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 4014726..23cfe31 100644 --- a/scripts/install +++ b/scripts/install @@ -92,15 +92,15 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD'S PLUGINS #================================================= -#ynh_script_progression --message="Installing $app plugins..." --weight=90 +ynh_script_progression --message="Installing $app plugins..." --weight=90 -#pushd "$install_dir" -# ynh_exec_warn_less npm install pnpm -g -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} -# if [ $mypads -eq 1 ]; then -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} -# fi -#popd +pushd "$install_dir" + ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} + if [ $mypads -eq 1 ]; then + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} + fi +popd #================================================= # INSTALL ETHERPAD From 423a8483e8b377d239eb3cb9048a952c71122124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 19:13:08 +0200 Subject: [PATCH 27/68] Update install --- scripts/install | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 23cfe31..f8a02d5 100644 --- a/scripts/install +++ b/scripts/install @@ -96,9 +96,16 @@ ynh_script_progression --message="Installing $app plugins..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_font_size@${ep_font_size_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_align@${ep_align_version} \ + ep_author_hover@${ep_author_hover_version} \ + ep_delete_empty_pads@${ep_delete_empty_pads_version} \ + ep_headings2@${ep_headings2_version} \ + ep_markdown@${ep_markdown_version} \ + ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_mypads@${mypads_version} fi popd From 97ea3ce3424e1da600607923ec961431814c0808 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 9 May 2024 20:45:33 +0200 Subject: [PATCH 28/68] Update install --- scripts/install | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/scripts/install b/scripts/install index f8a02d5..56f4e78 100644 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ chown $app -R /var/log/$app #================================================= # ADD A CONFIGURATION #================================================= -ynh_script_progression --message="Configure etherpad..." +ynh_script_progression --message="Configure $app..." abiword_path="null" soffice_path="null" @@ -90,13 +90,14 @@ chmod 600 "$install_dir/credentials.json" chown $app:$app "$install_dir/credentials.json" #================================================= -# INSTALL ETHERPAD'S PLUGINS +# INSTALL ETHERPAD #================================================= -ynh_script_progression --message="Installing $app plugins..." --weight=90 +ynh_script_progression --message="Installing $app..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ + pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ @@ -104,21 +105,11 @@ pushd "$install_dir" ep_markdown@${ep_markdown_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd -#================================================= -# INSTALL ETHERPAD -#================================================= -ynh_script_progression --message="Installing $app..." --weight=90 - -pushd "$install_dir" - ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh -popd - #================================================= # SOME HACKS #================================================= From 5db65550080fc9dceca2d1742ed378e45d146c08 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 May 2024 03:32:31 +0200 Subject: [PATCH 29/68] Upgrade to v2.0.3 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5283dec..a0eb9a6 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "1.9.5~ynh1" +version = "2.0.3~ynh1" maintainers = [] @@ -83,8 +83,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/1.9.5.tar.gz" - sha256 = "7f9a93370a9e2d900b64273c369cbb195bfc3747664b7632da9c1549c03f4407" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz" + sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 5b36eab8e7383911609144f11012be1f5e6529e1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 10 May 2024 01:32:34 +0000 Subject: [PATCH 30/68] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index dee75b2..f2947b3 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Shipped version:** 1.9.5~ynh1 +**Shipped version:** 2.0.3~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 38113e6..1222bf6 100644 --- a/README_eu.md +++ b/README_eu.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Paketatutako bertsioa:** 1.9.5~ynh1 +**Paketatutako bertsioa:** 2.0.3~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 1e682e4..eccca6d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -34,7 +34,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* -**Version incluse :** 1.9.5~ynh1 +**Version incluse :** 2.0.3~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index cd62dff..4decc8a 100644 --- a/README_gl.md +++ b/README_gl.md @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**Versión proporcionada:** 1.9.5~ynh1 +**Versión proporcionada:** 2.0.3~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1317d79..64fb05e 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Etherpad MyPads +# YunoHost 上的 Etherpad MyPads [![集成程度](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![工作状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) @@ -34,7 +34,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* -**分发版本：** 1.9.5~ynh1 +**分发版本：** 2.0.3~ynh1 **演示：** From c08f591b7dd81ab060b3651e26473e29e0a7d3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 17:29:34 +0200 Subject: [PATCH 31/68] fix --- scripts/_common.sh | 18 +++++++++--------- scripts/install | 4 ++-- scripts/upgrade | 13 ++++++++++++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3e08996..195f905 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,17 +12,17 @@ nodejs_version=20 mypads_version=1.7.24 # Plugin versions -ep_align_version=0.3.53 -ep_author_hover_version=0.3.37 -ep_comments_page_version=1.0.5 +ep_align_version=0.3.94 +ep_author_hover_version=0.3.55 +ep_comments_page_version=1.0.33 ep_countable_version=0.0.13 ep_delete_empty_pads_version=0.0.10 -ep_font_color_version=0.0.63 -ep_headings2_version=0.2.44 -ep_markdown_version=0.1.50 -ep_spellcheck_version=0.0.43 -ep_subscript_and_superscript_version=0.2.47 -ep_font_size_version=0.4.44 +ep_font_color_version=0.0.86 +ep_headings2_version=0.2.62 +ep_markdown_version=0.1.77 +ep_spellcheck_version=0.0.59 +ep_subscript_and_superscript_version=0.3.7 +ep_font_size_version=0.4.59 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 56f4e78..658b49b 100644 --- a/scripts/install +++ b/scripts/install @@ -97,7 +97,7 @@ ynh_script_progression --message="Installing $app..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ - pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ @@ -105,7 +105,7 @@ pushd "$install_dir" ep_markdown@${ep_markdown_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd diff --git a/scripts/upgrade b/scripts/upgrade index 5c5e8c9..98f9f4e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -165,7 +165,18 @@ ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_align@${ep_align_version} \ + ep_author_hover@${ep_author_hover_version} \ + ep_delete_empty_pads@${ep_delete_empty_pads_version} \ + ep_headings2@${ep_headings2_version} \ + ep_markdown@${ep_markdown_version} \ + ep_font_size@${ep_font_size_version} + if [ $mypads -eq 1 ]; then + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_mypads@${mypads_version} + fi popd #================================================= From 64bf43e3ae9efbf412aa5b63c58abf41c2868bea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 15:29:39 +0000 Subject: [PATCH 32/68] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) 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..ff1d058 --- /dev/null +++ b/README_es.md @@ -0,0 +1,65 @@ + + +# Etherpad MyPads para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![Instalar Etherpad MyPads con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarEtherpad MyPads 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 + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**Versión actual:** 2.0.3~ynh1 + +**Demo:** + +## Capturas + +![Captura de Etherpad MyPads](./doc/screenshots/etherpad_demo.gif) + +## 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/etherpad_mypads_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +o +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** From 8829add6b8ac8fe6830726a7c1b5dab496477461 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 15:30:38 +0000 Subject: [PATCH 33/68] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) 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..ff1d058 --- /dev/null +++ b/README_es.md @@ -0,0 +1,65 @@ + + +# Etherpad MyPads para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/etherpad_mypads.svg)](https://dash.yunohost.org/appci/app/etherpad_mypads) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad_mypads.maintain.svg) + +[![Instalar Etherpad MyPads con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad_mypads) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarEtherpad MyPads 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 + +Etherpad is a real-time collaborative editor scalable to thousands of simultaneous real time users. It provides full data export capabilities, and runs on your server, under your control. + +This version of Etherpad is preconfigured with a collection of plugins: + +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* +- [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* +- [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* +- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* +- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* +- [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* +- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* +- [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* +- [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* +- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* +- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* +- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + + +**Versión actual:** 2.0.3~ynh1 + +**Demo:** + +## Capturas + +![Captura de Etherpad MyPads](./doc/screenshots/etherpad_demo.gif) + +## 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/etherpad_mypads_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +o +sudo yunohost app upgrade etherpad_mypads -u https://github.com/YunoHost-Apps/etherpad_mypads_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** From 429adedd66c976b7e3e56a2518197992a9396072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 22:49:55 +0200 Subject: [PATCH 34/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 658b49b..3e0ec33 100644 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ popd if [ $mypads -eq 1 ] then - ynh_script_progression --message="Tweaking mypad configuration..." --weight=1 + ynh_script_progression --message="Tweaking MyPad configuration..." --weight=1 # Add a link to Etherpad to allow anonymous pads creation from MyPads. ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*" --replace_string="&Pads anonymes" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/fr.json From ec73f13e929ad1900c1298eae2e8e40b83c6c8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 22:52:07 +0200 Subject: [PATCH 35/68] cleaning --- scripts/install | 4 ++-- scripts/upgrade | 28 +--------------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/scripts/install b/scripts/install index 3e0ec33..274dda4 100644 --- a/scripts/install +++ b/scripts/install @@ -116,12 +116,12 @@ popd if [ $mypads -eq 1 ] then - ynh_script_progression --message="Tweaking MyPad configuration..." --weight=1 + ynh_script_progression --message="Tweaking MyPads configuration..." --weight=1 # Add a link to Etherpad to allow anonymous pads creation from MyPads. ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*" --replace_string="&Pads anonymes" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/fr.json ynh_replace_string --match_string="^ *\"DESCRIPTION\": .*" --replace_string="&Anonymous pads" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/en.json - # And a link to etherpad admin from Mypads. + # And a link to Etherpad admin from MyPads. ynh_replace_string --match_string="^ *\"FOOTER\": .*2.0" --replace_string="& | Etherpad admin" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/en.json ynh_replace_string --match_string="^ *\"FOOTER\": .*2.0" --replace_string="& | Etherpad admin" --target_file=$install_dir/node_modules/ep_mypads/static/l10n/fr.json diff --git a/scripts/upgrade b/scripts/upgrade index 98f9f4e..9dbdded 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Activating maintenance mode..." --weight=2 -# Wait for etherpad to be fully started # (... but why ???) +# Wait for Etherpad to be fully started # (... but why ???) ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" ynh_maintenance_mode_ON @@ -132,32 +132,6 @@ chown $app:$app "$install_dir/settings.json" chmod 600 "$install_dir/credentials.json" chown $app:$app "$install_dir/credentials.json" -#================================================= -# INSTALL ETHERPAD'S PLUGINS -#================================================= - -# If upgrading from an old version and table of content is there, remove it -#if ynh_compare_current_package_version --comparison lt --version 1.9.1~ynh3 -#then -# pushd "$install_dir" -# if ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ls 2>/dev/null | grep -q ep_table_of_contents -# then -# ynh_script_progression --message="Uninstalling ep_table_of_contents..." --weight=2 -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm uninstall ep_table_of_contents -# fi -# popd -#fi - -#ynh_script_progression --message="Installing Etherpad plugins..." --weight=10 - -#pushd "$install_dir" -# ynh_exec_warn_less npm install pnpm -g -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_align@${ep_align_version} ep_author_hover@${ep_author_hover_version} ep_comments_page@${ep_comments_page_version} ep_countable@${ep_countable_version} ep_delete_empty_pads@${ep_delete_empty_pads_version} ep_font_color@${ep_font_color_version} ep_headings2@${ep_headings2_version} ep_markdown@${ep_markdown_version} ep_spellcheck@${ep_spellcheck_version} ep_subscript_and_superscript@${ep_subscript_and_superscript_version} ep_font_size@${ep_font_size_version} -# if [ $mypads -eq 1 ]; then -# ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} -# fi -#popd - #================================================= # UPGRADE NPM MODULES #================================================= From ef73e1e9da7e85f5e19c34a5dad10ea18d646490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 22:54:44 +0200 Subject: [PATCH 36/68] Update tests.toml --- tests.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests.toml b/tests.toml index 239456b..6c56928 100644 --- a/tests.toml +++ b/tests.toml @@ -20,19 +20,19 @@ test_format = 1.0 test_upgrade_from.4e8049b31708b9f0223ee1a6ca8f153f04ec7e40.name = "1.9.1" -[with_mypads] +[with_MyPads] args.export = "libreoffice" args.mypads = 1 args.useldap = 1 only = ["install.root"] -[with_abiword] +[with_Abiword] args.export = "abiword" args.mypads = 0 args.useldap = 0 only = ["install.root"] -[with_libreoffice] +[with_Libreoffice] args.export = "libreoffice" args.mypads = 0 args.useldap = 0 From c517c1ab851ca5b8badedcffc292953f324de757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 22:59:22 +0200 Subject: [PATCH 37/68] remove plugins --- scripts/_common.sh | 6 ------ scripts/install | 1 - scripts/upgrade | 1 - 3 files changed, 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 195f905..5003c6e 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -14,14 +14,8 @@ mypads_version=1.7.24 # Plugin versions ep_align_version=0.3.94 ep_author_hover_version=0.3.55 -ep_comments_page_version=1.0.33 -ep_countable_version=0.0.13 ep_delete_empty_pads_version=0.0.10 -ep_font_color_version=0.0.86 ep_headings2_version=0.2.62 -ep_markdown_version=0.1.77 -ep_spellcheck_version=0.0.59 -ep_subscript_and_superscript_version=0.3.7 ep_font_size_version=0.4.59 #================================================= diff --git a/scripts/install b/scripts/install index 274dda4..11318df 100644 --- a/scripts/install +++ b/scripts/install @@ -102,7 +102,6 @@ pushd "$install_dir" ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ ep_headings2@${ep_headings2_version} \ - ep_markdown@${ep_markdown_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ diff --git a/scripts/upgrade b/scripts/upgrade index 9dbdded..15844e8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -145,7 +145,6 @@ pushd $install_dir ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ ep_headings2@${ep_headings2_version} \ - ep_markdown@${ep_markdown_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ From 86a8ac3ecd0e9adbad82e870f52f730bf61e5cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 23:02:27 +0200 Subject: [PATCH 38/68] cleaning --- doc/DESCRIPTION.md | 7 +------ doc/DESCRIPTION_fr.md | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index ea28461..2781d86 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -5,12 +5,7 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 6894628..ee14314 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -2,15 +2,9 @@ Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers Cette version d'Etherpad est préconfigurée avec une collection de plugins: -- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad* +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour Etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Ajout de l'alignement à gauche/centre/droit/justifié* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Affichage de l'auteur lorsqu'on passe la souris au dessus d'un texte* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajout de commentaire dans la barre latéral + lien avec le texte du pad* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajout du compte de paragraphes, mots, caractères* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Suppression des pads qui n'ont jamais été édités* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Possibilité de changer la couleur de la police* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Possibilité de changer la taille de la police* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Possibilité de définir des titres* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Editiion et export en Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajout de la correction orthographique* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* From 9adb397333534ad7df3abb18bfe005db1827312a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 21:02:31 +0000 Subject: [PATCH 39/68] Auto-update READMEs --- README.md | 7 +------ README_es.md | 7 +------ README_eu.md | 7 +------ README_fr.md | 8 +------- README_gl.md | 7 +------ README_zh_Hans.md | 7 +------ 6 files changed, 6 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index f2947b3..aedd3ab 100644 --- a/README.md +++ b/README.md @@ -23,15 +23,10 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + **Shipped version:** 2.0.3~ynh1 diff --git a/README_es.md b/README_es.md index ff1d058..2a954d5 100644 --- a/README_es.md +++ b/README_es.md @@ -23,15 +23,10 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + **Versión actual:** 2.0.3~ynh1 diff --git a/README_eu.md b/README_eu.md index 1222bf6..0d727a4 100644 --- a/README_eu.md +++ b/README_eu.md @@ -23,15 +23,10 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + **Paketatutako bertsioa:** 2.0.3~ynh1 diff --git a/README_fr.md b/README_fr.md index eccca6d..25c9df8 100644 --- a/README_fr.md +++ b/README_fr.md @@ -20,18 +20,12 @@ Etherpad est un éditeur collaboratif en temps réel évolutif pour des milliers Cette version d'Etherpad est préconfigurée avec une collection de plugins: -- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour etherpad* +- [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groupes et pads privés pour Etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Ajout de l'alignement à gauche/centre/droit/justifié* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Affichage de l'auteur lorsqu'on passe la souris au dessus d'un texte* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Ajout de commentaire dans la barre latéral + lien avec le texte du pad* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Ajout du compte de paragraphes, mots, caractères* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Suppression des pads qui n'ont jamais été édités* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Possibilité de changer la couleur de la police* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Possibilité de changer la taille de la police* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Possibilité de définir des titres* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Editiion et export en Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Ajout de la correction orthographique* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support des exposants et indices* **Version incluse :** 2.0.3~ynh1 diff --git a/README_gl.md b/README_gl.md index 4decc8a..4a3e138 100644 --- a/README_gl.md +++ b/README_gl.md @@ -23,15 +23,10 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + **Versión proporcionada:** 2.0.3~ynh1 diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 64fb05e..4ff0d0c 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -23,15 +23,10 @@ This version of Etherpad is preconfigured with a collection of plugins: - [ep_mypads](https://www.npmjs.com/package/ep_mypads) - *Groups and private pads for etherpad* - [ep_align](https://www.npmjs.com/package/ep_align) - *Add Left/Center/Right/Justify alignment* - [ep_author_hover](https://www.npmjs.com/package/ep_author_hover) - *Display author names when hovereing text* -- [ep_comments_page](https://www.npmjs.com/package/ep_comments_page) - *Add comments on sidebar and link it to the text.* -- [ep_countable](https://www.npmjs.com/package/ep_countable) - *Add paragraphs, words and characters count* - [ep_delete_empty_pads](https://www.npmjs.com/package/ep_delete_empty_pads) - *Delete pads which were never edited* -- [ep_font_color](https://www.npmjs.com/package/ep_font_color) - *Be able to change font color* - [ep_font_size](https://www.npmjs.com/package/ep_font_size) - *Be able to change font size* - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Be able to set text as headers* -- [ep_markdown](https://www.npmjs.com/package/ep_markdown) - *Edit and export as Markdown* -- [ep_spellcheck](https://www.npmjs.com/package/ep_spellcheck) - *Add spell checking* -- [ep_subscript_and_superscript](https://www.npmjs.com/package/ep_subscript_and_superscript) - *Support for subscript and superscript* + **分发版本：** 2.0.3~ynh1 From ea41c6f81bd62630646d21daf8b3ac46f7869a2b 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 07:05:24 +0200 Subject: [PATCH 40/68] Update install --- scripts/install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/install b/scripts/install index 11318df..c84e528 100644 --- a/scripts/install +++ b/scripts/install @@ -98,15 +98,15 @@ pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ - ep_align@${ep_align_version} \ - ep_author_hover@${ep_author_hover_version} \ - ep_delete_empty_pads@${ep_delete_empty_pads_version} \ - ep_headings2@${ep_headings2_version} \ - ep_font_size@${ep_font_size_version} - if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ - ep_mypads@${mypads_version} - fi + ep_align@${ep_align_version} \ + ep_author_hover@${ep_author_hover_version} \ + ep_delete_empty_pads@${ep_delete_empty_pads_version} \ + ep_headings2@${ep_headings2_version} \ + ep_font_size@${ep_font_size_version} + if [ $mypads -eq 1 ]; then + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_mypads@${mypads_version} + fi popd #================================================= From fa807c0fbd0938d32a38f832e2882c1875b0c823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 2 Jun 2024 14:32:38 +0200 Subject: [PATCH 41/68] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 54027d6..a7a98da 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad MyPads" description.en = "Online editor providing collaborative editing in real-time" description.fr = "Éditeur en ligne fournissant l'édition collaborative en temps réel" -version = "2.0.3~ynh1" +version = "2.1.0~ynh1" maintainers = [] @@ -83,8 +83,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.0.3.tar.gz" - sha256 = "6dc19addc8280806590f9a82d4426a88a8ef77c7841f99f97a50d6aa6c9ecc1a" + url = "https://github.com/ether/etherpad-lite/archive/refs/tags/2.1.0.tar.gz" + sha256 = "68a238852b82088a539228fb83eb4efa6599da163e6a3214e5cf15144a50ec49" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 279c4e9c03a645d151060fe44880bc1bb5b919cb Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 2 Jun 2024 12:32:43 +0000 Subject: [PATCH 42/68] Auto-update READMEs --- ALL_README.md | 2 +- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) 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) diff --git a/README.md b/README.md index aedd3ab..fc24bf8 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ This version of Etherpad is preconfigured with a collection of plugins: -**Shipped version:** 2.0.3~ynh1 +**Shipped version:** 2.1.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 2a954d5..621ab6d 100644 --- a/README_es.md +++ b/README_es.md @@ -29,7 +29,7 @@ This version of Etherpad is preconfigured with a collection of plugins: -**Versión actual:** 2.0.3~ynh1 +**Versión actual:** 2.1.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 0d727a4..3d2a752 100644 --- a/README_eu.md +++ b/README_eu.md @@ -29,7 +29,7 @@ This version of Etherpad is preconfigured with a collection of plugins: -**Paketatutako bertsioa:** 2.0.3~ynh1 +**Paketatutako bertsioa:** 2.1.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 25c9df8..d4afcde 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,7 +28,7 @@ Cette version d'Etherpad est préconfigurée avec une collection de plugins: - [ep_headings2](https://www.npmjs.com/package/ep_headings2) - *Possibilité de définir des titres* -**Version incluse :** 2.0.3~ynh1 +**Version incluse :** 2.1.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 4a3e138..dbadcc1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -29,7 +29,7 @@ This version of Etherpad is preconfigured with a collection of plugins: -**Versión proporcionada:** 2.0.3~ynh1 +**Versión proporcionada:** 2.1.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 4ff0d0c..e8af963 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -29,7 +29,7 @@ This version of Etherpad is preconfigured with a collection of plugins: -**分发版本：** 2.0.3~ynh1 +**分发版本：** 2.1.0~ynh1 **演示：** From 8a6dca4150051752b5614612acf2eb56d1822333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:07:07 +0200 Subject: [PATCH 43/68] fix prompt --- scripts/install | 6 +++--- scripts/upgrade | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/install b/scripts/install index c84e528..4f9b12f 100644 --- a/scripts/install +++ b/scripts/install @@ -96,15 +96,15 @@ ynh_script_progression --message="Installing $app..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd diff --git a/scripts/upgrade b/scripts/upgrade index 15844e8..9ef6ddd 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -139,15 +139,15 @@ ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd From b7e9c4dcc46c14805da1c06f8d2e5968f4f7e22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:13:23 +0200 Subject: [PATCH 44/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 4f9b12f..7c75dbe 100644 --- a/scripts/install +++ b/scripts/install @@ -92,7 +92,7 @@ chown $app:$app "$install_dir/credentials.json" #================================================= # INSTALL ETHERPAD #================================================= -ynh_script_progression --message="Installing $app..." --weight=90 +ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g From 3da143f64fee7cb2662c3d2b037db4b2e466054a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:12:55 +0200 Subject: [PATCH 45/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 7c75dbe..d7b1fed 100644 --- a/scripts/install +++ b/scripts/install @@ -95,7 +95,7 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" - ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_align@${ep_align_version} \ From 110909830b94c7f1ecd02ad1972343544623828f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:13:12 +0200 Subject: [PATCH 46/68] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9ef6ddd..0d5e196 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,7 +138,7 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir - ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ ep_align@${ep_align_version} \ From efcc151fbd3b44a9c4777126e9e9f3efcb387678 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:14:13 +0200 Subject: [PATCH 47/68] Update restore --- scripts/restore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/restore b/scripts/restore index 230ffe9..e785127 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,11 +28,6 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_install_nodejs --nodejs_version=$nodejs_version -pushd $install_dir - ynh_use_nodejs - ynh_exec_warn_less npm install pnpm -g -popd - ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" mkdir -p /var/log/$app From 3d56a040b514ae1a540ed14f60baafc2abb8a3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:17:43 +0200 Subject: [PATCH 48/68] Update _common.sh --- scripts/_common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5003c6e..580ccd0 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -11,12 +11,12 @@ nodejs_version=20 # This variable is mostly used to force an upgrade of the package in case of new versions of MyPads. mypads_version=1.7.24 -# Plugin versions -ep_align_version=0.3.94 +# Plugin versions -> https://static.etherpad.org/index.html +ep_align_version=0.3.95 ep_author_hover_version=0.3.55 ep_delete_empty_pads_version=0.0.10 -ep_headings2_version=0.2.62 -ep_font_size_version=0.4.59 +ep_headings2_version=0.2.63 +ep_font_size_version=0.4.60 #================================================= # PERSONAL HELPERS From 699db057601075d985e541e0e6698b3414c2c89a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:18:40 +0200 Subject: [PATCH 49/68] Update backup --- scripts/backup | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/backup b/scripts/backup index 720ff89..a03a317 100644 --- a/scripts/backup +++ b/scripts/backup @@ -22,30 +22,16 @@ 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 FAIL2BAN CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/fail2ban/jail.d/$app.conf" ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf" -#================================================= -# SPECIFIC BACKUP -#================================================= -# BACKUP LOGROTATE -#================================================= - ynh_backup --src_path="/etc/logrotate.d/$app" -#================================================= -# BACKUP SYSTEMD -#================================================= - ynh_backup --src_path="/etc/systemd/system/$app.service" #================================================= From d31b9d67c46fbf08fc8ece5a761ff6d1cdcc984e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:44:11 +0200 Subject: [PATCH 50/68] Update install --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index d7b1fed..ade656d 100644 --- a/scripts/install +++ b/scripts/install @@ -95,16 +95,16 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd From 60b0e9518246ecd54d6ae03871c5299d8bcb7cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:59:27 +0200 Subject: [PATCH 51/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ade656d..6b7d4fa 100644 --- a/scripts/install +++ b/scripts/install @@ -95,7 +95,7 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm@latest --activate + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ From ec56c5096417be03881b12f3f773aa2197cb20af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:42:23 +0200 Subject: [PATCH 52/68] Update restore --- scripts/restore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/restore b/scripts/restore index e785127..8a49d21 100644 --- a/scripts/restore +++ b/scripts/restore @@ -28,6 +28,10 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_install_nodejs --nodejs_version=$nodejs_version +pushd "$install_dir" + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate +popd + ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" mkdir -p /var/log/$app From e6bbeb067f4e589ab636c0bdd72b20cf03e02a72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 6 Jun 2024 16:43:26 +0200 Subject: [PATCH 53/68] Update restore --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index 8a49d21..1fcd245 100644 --- a/scripts/restore +++ b/scripts/restore @@ -29,6 +29,7 @@ ynh_script_progression --message="Restoring system configurations related to $ap ynh_install_nodejs --nodejs_version=$nodejs_version pushd "$install_dir" + ynh_use_nodejs ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate popd From 04d33a1aea09d5882aaf38891776c3a678bdae52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:21:07 +0200 Subject: [PATCH 54/68] fix --- doc/ADMIN.md | 2 +- doc/ADMIN_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ADMIN.md b/doc/ADMIN.md index 9a80ecc..b5a7637 100644 --- a/doc/ADMIN.md +++ b/doc/ADMIN.md @@ -1,4 +1,4 @@ -You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`. +You can access two different admin panels, for Etherpad by accessing `__DOMAIN____PATH__/admin` and for MyPads by `__DOMAIN____PATH__/mypads/?/admin`. You can also find a configuration file for Etherpad at this path `__INSTALL_DIR__/settings.json`. *Skin Builder* (accessible at this address `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) allows you to customize the skin of your pad. It will give you a parameter to copy into your configuration file `__INSTALL_DIR__/settings.json`. diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md index 3e62731..2a97a25 100644 --- a/doc/ADMIN_fr.md +++ b/doc/ADMIN_fr.md @@ -1,3 +1,3 @@ -Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__admin` et pour MyPads par `__DOMAIN____PATH__/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`. +Vous pouvez accéder à deux panneaux d'administration différents, pour Etherpad en accédant à `__DOMAIN____PATH__/admin` et pour MyPads par `__DOMAIN____PATH__/mypads/?/admin`. Vous pouvez également trouver le fichier de configuration pour Etherpad à `__INSTALL_DIR__/settings.json`. *Skin Builder* (accessible à cette adresse `https://__DOMAIN____PATH__/pad/p/test#skinvariantsbuilder`) vous permet de personnaliser l'apparence de votre pad. Il vous donnera un paramètre à copier dans votre fichier de configuration `__INSTALL_DIR__/settings.json`. From d819bb7a0be7e2b3342ae95222055fe38394132f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 13:22:27 +0200 Subject: [PATCH 55/68] fix --- doc/POST_INSTALL.md | 4 ++-- doc/POST_INSTALL_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/POST_INSTALL.md b/doc/POST_INSTALL.md index 11d381d..dfb933b 100644 --- a/doc/POST_INSTALL.md +++ b/doc/POST_INSTALL.md @@ -1,3 +1,3 @@ You can access two different admin panels: -- for Etherpad by accessing https://__DOMAIN____PATH__admin -- for MyPads (if installed) by accessing https://__DOMAIN____PATH__mypads/?/admin +- for Etherpad by accessing https://__DOMAIN____PATH__/admin +- for MyPads (if installed) by accessing https://__DOMAIN____PATH__/mypads/?/admin diff --git a/doc/POST_INSTALL_fr.md b/doc/POST_INSTALL_fr.md index 1840905..a2f69cf 100644 --- a/doc/POST_INSTALL_fr.md +++ b/doc/POST_INSTALL_fr.md @@ -1,3 +1,3 @@ Vous pouvez accéder à deux panneaux d'administration différents : -- pour Etherpad en accédant à https://__DOMAIN____PATH__admin -- pour MyPads (si installé) en accédant à https://__DOMAIN____PATH__mypads/?/admin +- pour Etherpad en accédant à https://__DOMAIN____PATH__/admin +- pour MyPads (si installé) en accédant à https://__DOMAIN____PATH__/mypads/?/admin From 5a4a3abf8357e9c53b350d23b7886184526921ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:40:18 +0200 Subject: [PATCH 56/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6b7d4fa..616c87b 100644 --- a/scripts/install +++ b/scripts/install @@ -96,7 +96,7 @@ ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ From f445932c9fa0cb8bcc8e958414175e11888880c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:40:42 +0200 Subject: [PATCH 57/68] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0d5e196..bbddb2e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -140,7 +140,7 @@ ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ From 2b66006d90d7ed01a8183e19f386997b539cc402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:41:05 +0200 Subject: [PATCH 58/68] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index bbddb2e..0b12e95 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,8 +138,8 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ From 77486bff686cf2e4bc7fd280430ae707dbbcffd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:41:26 +0200 Subject: [PATCH 59/68] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 0b12e95..d00d539 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,7 +147,7 @@ pushd $install_dir ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd From 191966179dfb1fcbd111ed6e8cc91f706889eeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:48:45 +0200 Subject: [PATCH 60/68] Update upgrade --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index d00d539..1e7f155 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,8 +138,8 @@ chown $app:$app "$install_dir/credentials.json" ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir - ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ + ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ From 45878249eda59f67025a6719f6a6002210502390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Fri, 7 Jun 2024 20:51:15 +0200 Subject: [PATCH 61/68] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 616c87b..6b7d4fa 100644 --- a/scripts/install +++ b/scripts/install @@ -96,7 +96,7 @@ ynh_script_progression --message="Installing $app..." --weight=30 pushd "$install_dir" ynh_exec_warn_less env $ynh_node_load_PATH corepack enable && COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true COREPACK_ENABLE_DOWNLOAD_PROMPT=0 bin/installDeps.sh && \ ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ From e3711035edf0b266011c7ac95ea6c66e140dbdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:15:07 +0200 Subject: [PATCH 62/68] cleaning --- conf/systemd.service | 4 ++-- scripts/install | 3 +-- scripts/upgrade | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 4808e55..404663e 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -10,8 +10,8 @@ WorkingDirectory=__INSTALL_DIR__/ Environment=ETHERPAD_PRODUCTION=true Environment="__YNH_NODE_LOAD_PATH__" ExecStart=__INSTALL_DIR__/bin/run.sh -StandardOutput=append:/var/log/__APP__/etherpad.log -StandardError=inherit +#StandardOutput=append:/var/log/__APP__/etherpad.log +#StandardError=inherit Restart=always # Sandboxing options to harden security diff --git a/scripts/install b/scripts/install index 6b7d4fa..c5d44a9 100644 --- a/scripts/install +++ b/scripts/install @@ -104,8 +104,7 @@ pushd "$install_dir" ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ - ep_mypads@${mypads_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} fi popd diff --git a/scripts/upgrade b/scripts/upgrade index 1e7f155..4784247 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -147,8 +147,7 @@ pushd $install_dir ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ - ep_mypads@${mypads_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} fi popd From dff2349c4ad36342ccb6704661a04bf33bafdf80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:38:05 +0200 Subject: [PATCH 63/68] Update systemd.service --- conf/systemd.service | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/systemd.service b/conf/systemd.service index 404663e..ff11316 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,6 +9,7 @@ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ Environment=ETHERPAD_PRODUCTION=true Environment="__YNH_NODE_LOAD_PATH__" +Environment="NODE_ENV=production" ExecStart=__INSTALL_DIR__/bin/run.sh #StandardOutput=append:/var/log/__APP__/etherpad.log #StandardError=inherit From c68ec619fe81f0be68ed9103b0f92221a88b2d72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:40:51 +0200 Subject: [PATCH 64/68] Update upgrade --- scripts/upgrade | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4784247..ea5750e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -81,13 +81,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5 ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs -#================================================= -# NGINX CONFIGURATION -#================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=2 - -ynh_add_nginx_config - #================================================= # SPECIFIC UPGRADE #================================================= @@ -162,9 +155,11 @@ then fi #================================================= -# SETUP SYSTEMD +# REAPPLY SYSTEM CONFIGURATIONS #================================================= -ynh_script_progression --message="Configuring systemd service..." --weight=2 +ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 + +ynh_add_nginx_config ynh_add_systemd_config From afda34b468104242a368e1ea5771918872b2e4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:41:48 +0200 Subject: [PATCH 65/68] Update upgrade --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ea5750e..18ad54b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -140,7 +140,8 @@ pushd $install_dir ep_headings2@${ep_headings2_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins ep_mypads@${mypads_version} + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_mypads@${mypads_version} fi popd From 607b91ecdf69109b66c5ca913206d77cc70d2ff3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 12:45:31 +0200 Subject: [PATCH 66/68] remove timeout --- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 928c47c..ccce697 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -36,7 +36,7 @@ ynh_change_url_nginx_config ynh_script_progression --message="Starting a systemd service..." --weight=10 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" #================================================= # DEACTIVE MAINTENANCE MODE diff --git a/scripts/install b/scripts/install index c5d44a9..10841c2 100644 --- a/scripts/install +++ b/scripts/install @@ -147,7 +147,7 @@ ynh_use_logrotate --specific_user=$app/$app ynh_script_progression --message="Starting systemd service..." --weight=20 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" if [ $mypads -eq 1 ] then @@ -155,7 +155,7 @@ then ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql" # Wait for etherpad to be fully started - ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" + ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" fi #================================================= diff --git a/scripts/restore b/scripts/restore index 1fcd245..a698cc2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,7 +65,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/upgrade b/scripts/upgrade index 18ad54b..aa18c2d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -175,7 +175,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app #================================================= ynh_script_progression --message="Starting systemd service..." --weight=9 -ynh_systemd_action --service_name=$app --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" #================================================= # UPGRADE FAIL2BAN From c3f4e0ed0b5336709f514719c1eaa96d84954573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:19:19 +0200 Subject: [PATCH 67/68] log to systemd --- conf/systemd.service | 2 -- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index ff11316..0f9ef24 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -11,8 +11,6 @@ Environment=ETHERPAD_PRODUCTION=true Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" ExecStart=__INSTALL_DIR__/bin/run.sh -#StandardOutput=append:/var/log/__APP__/etherpad.log -#StandardError=inherit Restart=always # Sandboxing options to harden security diff --git a/scripts/change_url b/scripts/change_url index ccce697..74fc748 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -36,7 +36,7 @@ ynh_change_url_nginx_config ynh_script_progression --message="Starting a systemd service..." --weight=10 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd" #================================================= # DEACTIVE MAINTENANCE MODE diff --git a/scripts/install b/scripts/install index 10841c2..ec0cac5 100644 --- a/scripts/install +++ b/scripts/install @@ -155,7 +155,7 @@ then ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql" # Wait for etherpad to be fully started - ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" + ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd" fi #================================================= diff --git a/scripts/restore b/scripts/restore index a698cc2..4c0dbfa 100644 --- a/scripts/restore +++ b/scripts/restore @@ -65,7 +65,7 @@ ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./ #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." -ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd" ynh_systemd_action --action=reload --service_name=nginx diff --git a/scripts/upgrade b/scripts/upgrade index aa18c2d..ceed65e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,7 +9,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Activating maintenance mode..." --weight=2 # Wait for Etherpad to be fully started # (... but why ???) -ynh_systemd_action --action=restart --line_match="You can access your Etherpad instance at" --log_path="/var/log/$app/etherpad.log" --timeout="120" +ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd" ynh_maintenance_mode_ON @@ -175,7 +175,7 @@ ynh_use_logrotate --non-append --specific_user=$app/$app #================================================= ynh_script_progression --message="Starting systemd service..." --weight=9 -ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" +ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="systemd" #================================================= # UPGRADE FAIL2BAN From 12ed3a06076b3a3ffe74cfa276276ac2c5bfbeb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 20 Jun 2024 17:26:18 +0200 Subject: [PATCH 68/68] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index ec0cac5..0c661f0 100644 --- a/scripts/install +++ b/scripts/install @@ -147,7 +147,7 @@ ynh_use_logrotate --specific_user=$app/$app ynh_script_progression --message="Starting systemd service..." --weight=20 # Start a systemd service -ynh_systemd_action --service_name=$app --action=restart --line_match="Your Etherpad version is" --log_path="/var/log/$app/etherpad.log" +ynh_systemd_action --service_name=$app --action=restart --log_path=systemd --line_match="Your Etherpad version is" if [ $mypads -eq 1 ] then @@ -155,7 +155,7 @@ then ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/lang_mypads.sql" # Wait for etherpad to be fully started - ynh_systemd_action --action=restart --line_match="Your Etherpad version is" --log_path="systemd" + ynh_systemd_action --action=restart --log_path=systemd --line_match="Your Etherpad version is" fi #=================================================