From 0ab95a89b1773d4e66dcc251561c96e2fa90dbf4 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:29:40 +0200 Subject: [PATCH 01/14] 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 7941a35..a131657 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -504,7 +504,7 @@ /* * Restrict socket.io transport methods */ - "socketTransportProtocols" : ["xhr-polling", "jsonp-polling", "htmlfile"], + "socketTransportProtocols" : ["websocket", "polling"], "socketIo": { /* From 3c30c09b274c09cfc04f77f7758105e95d009932 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:31:11 +0200 Subject: [PATCH 02/14] Update systemd.service --- conf/systemd.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index d2aa174..559f1e1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,9 +7,11 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ +Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=pnpm run prod +ExecStart=__INSTALL_DIR__/bin/run.sh +#ExecStart=pnpm run prod Restart=always # Sandboxing options to harden security From 9ed71d759a5b9721a9190eb2598d22d0e5d65ff5 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:17 +0200 Subject: [PATCH 03/14] Update settings.json --- conf/settings.json | 41 ++++++++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 9 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index a131657..f470605 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -292,14 +292,6 @@ */ "soffice": null, - /* - * Path to the Tidy executable. - * - * Tidy is used to improve the quality of exported pads. - * Setting it to null disables Tidy. - */ - "tidyHtml": null, - /* * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm @@ -627,5 +619,36 @@ /* * Enable/Disable case-insensitive pad names. */ - "lowerCasePadIds": false + "lowerCasePadIds": false, + + "sso": { + "issuer": "${SSO_ISSUER:http://localhost:9001}", + "clients": [ + { + "client_id": "${ADMIN_CLIENT:admin_client}", + "client_secret": "${ADMIN_SECRET:admin}", + "grant_types": ["authorization_code"], + "response_types": ["code"], + "redirect_uris": ["${ADMIN_REDIRECT:http://localhost:9001/admin/}"] + }, + { + "client_id": "${USER_CLIENT:user_client}", + "client_secret": "${USER_SECRET:user}", + "grant_types": ["authorization_code"], + "response_types": ["code"], + "redirect_uris": ["${USER_REDIRECT:http://localhost:9001/}"] + } + ] + } + + /* Set the time to live for the tokens + This is the time of seconds a user is logged into Etherpad + "ttl": { + "AccessToken": 3600, + "AuthorizationCode": 600, + "ClientCredentials": 3600, + "IdToken": 3600, + "RefreshToken": 86400 + } + */ } From 2350f97e1eefaac2006f53a80560e939935ef598 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:18:30 +0200 Subject: [PATCH 04/14] Update settings.json --- conf/settings.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/settings.json b/conf/settings.json index f470605..0bf1424 100644 --- a/conf/settings.json +++ b/conf/settings.json @@ -622,21 +622,21 @@ "lowerCasePadIds": false, "sso": { - "issuer": "${SSO_ISSUER:http://localhost:9001}", + "issuer": "${SSO_ISSUER:http://127.0.0.1:__PORT__}", "clients": [ { "client_id": "${ADMIN_CLIENT:admin_client}", "client_secret": "${ADMIN_SECRET:admin}", "grant_types": ["authorization_code"], "response_types": ["code"], - "redirect_uris": ["${ADMIN_REDIRECT:http://localhost:9001/admin/}"] + "redirect_uris": ["${ADMIN_REDIRECT:http://127.0.0.1:__PORT__/admin/}"] }, { "client_id": "${USER_CLIENT:user_client}", "client_secret": "${USER_SECRET:user}", "grant_types": ["authorization_code"], "response_types": ["code"], - "redirect_uris": ["${USER_REDIRECT:http://localhost:9001/}"] + "redirect_uris": ["${USER_REDIRECT:http://127.0.0.1:__PORT__/}"] } ] } From a33e08210c3c33c8d47acbd31e1aadb12aa8adc4 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:18:56 +0200 Subject: [PATCH 05/14] Update systemd.service --- conf/systemd.service | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 559f1e1..d2aa174 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,11 +7,9 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ -Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=__INSTALL_DIR__/bin/run.sh -#ExecStart=pnpm run prod +ExecStart=pnpm run prod Restart=always # Sandboxing options to harden security From d5f0ba7de580bd72474e95f86196bc64c0612646 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:20:53 +0200 Subject: [PATCH 06/14] Update _common.sh --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index b1ab6a0..2b9094e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -nodejs_version=20 +nodejs_version=22 #================================================= # PERSONAL HELPERS From b3fd9fd9b5a45f06216a42b0099357f5748038ae 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:22:15 +0200 Subject: [PATCH 07/14] Revert "Update systemd.service" This reverts commit a33e08210c3c33c8d47acbd31e1aadb12aa8adc4. --- conf/systemd.service | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index d2aa174..559f1e1 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,9 +7,11 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__INSTALL_DIR__/ +Environment=ETHERPAD_PRODUCTION=true Environment="NODE_ENV=production" Environment="__YNH_NODE_LOAD_PATH__" -ExecStart=pnpm run prod +ExecStart=__INSTALL_DIR__/bin/run.sh +#ExecStart=pnpm run prod Restart=always # Sandboxing options to harden security From 4bee65d01e66c4b22f71eac3cb033742c3751dc4 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:38:46 +0200 Subject: [PATCH 08/14] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0a0f018..c287ea3 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less npm install pnpm -g + #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 a8595a93af482c0ca4411626a0a846f11b5857ef 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:47 +0200 Subject: [PATCH 09/14] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c287ea3..0a0f018 100644 --- a/scripts/install +++ b/scripts/install @@ -80,7 +80,7 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - #ynh_exec_warn_less npm install pnpm -g + 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 baeeea21ca1267d358ec2ea383ee2ee43dfa7cb1 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 21:55:00 +0200 Subject: [PATCH 10/14] Update credentials.json --- conf/credentials.json | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/conf/credentials.json b/conf/credentials.json index 5655057..3925100 100644 --- a/conf/credentials.json +++ b/conf/credentials.json @@ -27,11 +27,23 @@ "database": "__REDIS_DB__" }, - /* - * Users for basic authentication. + /* + * User accounts. These accounts are used by: + * - default HTTP basic authentication if no plugin handles authentication + * - some but not all authentication plugins + * - some but not all authorization plugins * - * is_admin = true gives access to /admin. - * If you do not uncomment this, /admin will not be available! + * User properties: + * - password: The user's password. Some authentication plugins will ignore + * this. + * - is_admin: true gives access to /admin. Defaults to false. If you do not + * uncomment this, /admin will not be available! + * - readOnly: If true, this user will not be able to create new pads or + * modify existing pads. Defaults to false. + * - canCreate: If this is true and readOnly is false, this user can create + * new pads. Defaults to true. + * + * Authentication and authorization plugins may define additional properties. * * WARNING: passwords should not be stored in plaintext in this file. * If you want to mitigate this, please install ep_hash_auth and From feaaeb0af26eeecff78c1aeb806619d986c03cb4 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:50:35 +0200 Subject: [PATCH 11/14] Update install --- scripts/install | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/install b/scripts/install index 0a0f018..a3ec3cd 100644 --- a/scripts/install +++ b/scripts/install @@ -84,6 +84,13 @@ pushd $install_dir ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh popd +#Buiding admin +pushd $install_dir/admin +ynh_use_nodejs + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build + mv $install_dir/admin/dist $install_dir/src/templates/admin/ +popd + #================================================= # START SYSTEMD SERVICE #================================================= From 18b71fb531f2a8d28d5fdedf906fe17fbcb6dc32 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 21:50:40 +0000 Subject: [PATCH 12/14] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 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..39955f8 --- /dev/null +++ b/README_es.md @@ -0,0 +1,53 @@ + + +# Etherpad para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg) + +[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarEtherpad 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 installed without plugins and uses Redis as database. +Be aware, Redis database backup and restore is not fully implemented. +If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", + + +**Versión actual:** 2.0.3~ynh1 + +**Demo:** + +## Capturas + +![Captura de Etherpad](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug +o +sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** From cba3942ee5dbad94db105d9074ac680b5573abd3 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 19:20:05 +0200 Subject: [PATCH 13/14] Update install --- scripts/install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index a3ec3cd..9ada303 100644 --- a/scripts/install +++ b/scripts/install @@ -80,14 +80,15 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - ynh_exec_warn_less npm install pnpm -g + corepack enable && corepack prepare pnpm@latest --activate + #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 #Buiding admin pushd $install_dir/admin ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH corepack pnpm build mv $install_dir/admin/dist $install_dir/src/templates/admin/ popd From f9f2f1c5c0c5b97616b52b5e31bbcd2a2d4562b0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 17 May 2024 19:45:55 +0000 Subject: [PATCH 14/14] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 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..39955f8 --- /dev/null +++ b/README_es.md @@ -0,0 +1,53 @@ + + +# Etherpad para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/etherpad.svg)](https://dash.yunohost.org/appci/app/etherpad) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/etherpad.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/etherpad.maintain.svg) + +[![Instalar Etherpad con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=etherpad) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarEtherpad 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 installed without plugins and uses Redis as database. +Be aware, Redis database backup and restore is not fully implemented. +If you want to install Etherpad with plugins and mysql database: https://github.com/YunoHost-Apps/etherpad_mypads_ynh", + + +**Versión actual:** 2.0.3~ynh1 + +**Demo:** + +## Capturas + +![Captura de Etherpad](./doc/screenshots/screenshot.png) + +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación administrador oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug +o +sudo yunohost app upgrade etherpad -u https://github.com/YunoHost-Apps/etherpad_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:**