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 **演示:** 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 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] diff --git a/scripts/install b/scripts/install index 0a0f018..65be154 100644 --- a/scripts/install +++ b/scripts/install @@ -81,9 +81,17 @@ 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 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 + #================================================= # START SYSTEMD SERVICE #=================================================