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 01/13] 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 02/13] 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 03/13] 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 04/13] 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 5cea0ec8eff1b60d1135a88e4f3c50834a4d63dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 May 2024 15:55:33 +0200 Subject: [PATCH 05/13] Update _common.sh --- scripts/_common.sh | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2b9094e..184eecc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,42 +17,3 @@ nodejs_version=22 #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} - From 286adc2f6626abccb42f214b1fd5aa7e4a091a13 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 06/13] 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 d70f5c48dc8b3dc7dbd43fba96b3f7328a775ade 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 07/13] 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 25f7bb0aa2bd85c23b0bd5b18d73f9cfab73dd29 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 12 May 2024 21:50:40 +0000 Subject: [PATCH 08/13] 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 acf43a43235d737cf4d7afa24631adb280bfac40 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 09/13] 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 d8a991973c30696ab728de93284a6ba874f5ee13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 May 2024 15:55:33 +0200 Subject: [PATCH 10/13] Update _common.sh --- scripts/_common.sh | 39 --------------------------------------- 1 file changed, 39 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 2b9094e..184eecc 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,42 +17,3 @@ nodejs_version=22 #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} - From b430dca141fc9601bc8eb7fbd6ff080195876257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 20 May 2024 23:16:47 +0200 Subject: [PATCH 11/13] clean --- manifest.toml | 2 +- scripts/install | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8b26ec8..f2258f7 100644 --- a/manifest.toml +++ b/manifest.toml @@ -17,7 +17,7 @@ admindoc = "https://etherpad.org/doc/v2.0.2/" code = "https://github.com/ether/etherpad-lite" [integration] -yunohost = ">= 11.2" +yunohost = ">= 11.2.12" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index 9ada303..65be154 100644 --- a/scripts/install +++ b/scripts/install @@ -80,17 +80,17 @@ ynh_script_progression --message="Installing $app..." --weight=10 pushd $install_dir ynh_use_nodejs - corepack enable && corepack prepare pnpm@latest --activate - #ynh_exec_warn_less npm install pnpm -g + ynh_exec_warn_less npm install pnpm -g + #corepack enable && corepack prepare pnpm@latest --activate 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 corepack pnpm build - mv $install_dir/admin/dist $install_dir/src/templates/admin/ -popd +#pushd $install_dir/admin +#ynh_use_nodejs +# 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 #================================================= # START SYSTEMD SERVICE From d2573ee4e64dc056daa0f9921ddaaa40d6666252 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 13:28:12 +0200 Subject: [PATCH 12/13] Update manifest.toml --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 8cf44bd..951e097 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Etherpad" description.en = "Collaborative editing in real-time" description.fr = "Édition collaborative en temps réel" -version = "2.0.3~ynh1" +version = "2.1.0~ynh1" maintainers = ["eric_G"] @@ -63,8 +63,8 @@ ram.runtime = "50M" [resources] [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.ports] From bf923311df6b63039c1a1bb598d790c1a6e40a7d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 2 Jun 2024 11:28:18 +0000 Subject: [PATCH 13/13] 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 99ba42d..aced0a8 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ 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", -**Shipped version:** 2.0.3~ynh1 +**Shipped version:** 2.1.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 39955f8..d101b2e 100644 --- a/README_es.md +++ b/README_es.md @@ -22,7 +22,7 @@ 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 +**Versión actual:** 2.1.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 812b63f..3b188d8 100644 --- a/README_eu.md +++ b/README_eu.md @@ -22,7 +22,7 @@ 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", -**Paketatutako bertsioa:** 2.0.3~ynh1 +**Paketatutako bertsioa:** 2.1.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 00285ae..b7c03eb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Attention, la sauvegarde et la restauration de la base de données Redis ne sont Si vous souhaitez installer Etherpad avec les plugins et la base de données mysql : https://github.com/YunoHost-Apps/etherpad_mypads_ynh", -**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 442625d..5a42d01 100644 --- a/README_gl.md +++ b/README_gl.md @@ -22,7 +22,7 @@ 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 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 c38ac7c..607540e 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -22,7 +22,7 @@ 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", -**分发版本：** 2.0.3~ynh1 +**分发版本：** 2.1.0~ynh1 **演示：**