From 2f9403baeea0bb5dff9dae796c794c7da0b91d8c Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 15 Oct 2024 00:33:23 +0900 Subject: [PATCH 1/3] Update docs/configuring-playbook-etherpad.md: edit comment block for configuration Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-etherpad.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuring-playbook-etherpad.md b/docs/configuring-playbook-etherpad.md index 34d16fd92..11925c3a0 100644 --- a/docs/configuring-playbook-etherpad.md +++ b/docs/configuring-playbook-etherpad.md @@ -35,9 +35,9 @@ If you've decided to reuse the `matrix.` domain, you won't need to do any extra ```yaml etherpad_enabled: true -# Uncomment below to enable the admin web UI -# etherpad_admin_username: admin -# etherpad_admin_password: some-password +# Uncomment and adjust if you'd like to enable the admin web UI +# etherpad_admin_username: YOUR_USERNAME_HERE +# etherpad_admin_password: YOUR_PASSWORD_HERE ``` ## Installing From fbd4a48709f1560c9165bfa3252968218a437e7e Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Thu, 17 Oct 2024 02:22:51 +0900 Subject: [PATCH 2/3] Update docs/configuring-playbook-etherpad.md: add line breaks Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-etherpad.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/configuring-playbook-etherpad.md b/docs/configuring-playbook-etherpad.md index 11925c3a0..9ba52ed66 100644 --- a/docs/configuring-playbook-etherpad.md +++ b/docs/configuring-playbook-etherpad.md @@ -68,6 +68,7 @@ To integrate a standalone etherpad in a room, create your pad by visiting `https ### Set Dimension default to the self-hosted Etherpad (optional) If you decided to install [Dimension integration manager](configuring-playbook-dimension.md) alongside Etherpad, the Dimension administrator users can configure the default URL template. + The Dimension configuration menu can be accessed with the sprocket icon as you begin to add a widget to a room in Element. There you will find the Etherpad Widget Configuration action beneath the _Widgets_ tab. @@ -81,4 +82,5 @@ Example: `https://etherpad./p/$roomId_$padName?showChat=false` ## Known issues If your Etherpad widget fails to load, this might be due to Dimension generating a Pad name so long, the Etherpad app rejects it. + `$roomId_$padName` can end up being longer than 50 characters. You can avoid having this problem by altering the template so it only contains the three word random identifier `$padName`. From 844d8ef4c34b3b429d94f1257dbdc9dc12f76d6d Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Tue, 15 Oct 2024 01:05:33 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fix=20capitalization:=20etherpad=20?= =?UTF-8?q?=E2=86=92=20Etherpad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Suguru Hirahara --- docs/configuring-dns.md | 2 +- docs/configuring-playbook-etherpad.md | 2 +- roles/custom/matrix-base/defaults/main.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuring-dns.md b/docs/configuring-dns.md index 70ac3517d..c6c18d24d 100644 --- a/docs/configuring-dns.md +++ b/docs/configuring-dns.md @@ -71,7 +71,7 @@ The `sygnal.` subdomain may be necessary, because this playbook cou The `ntfy.` subdomain may be necessary, because this playbook could install the [ntfy](https://ntfy.sh/) UnifiedPush-compatible push notifications server. The installation of ntfy is disabled by default, it is not a core required component. To learn how to install it, see our [configuring ntfy guide](configuring-playbook-ntfy.md). If you do not wish to set up ntfy, feel free to skip the `ntfy.` DNS record. -The `etherpad.` subdomain may be necessary, because this playbook could install the [Etherpad](https://etherpad.org/) a highly customizable open source online editor providing collaborative editing in really real-time. The installation of etherpad is disabled by default, it is not a core required component. To learn how to install it, see our [configuring etherpad guide](configuring-playbook-etherpad.md). If you do not wish to set up etherpad, feel free to skip the `etherpad.` DNS record. +The `etherpad.` subdomain may be necessary, because this playbook could install the [Etherpad](https://etherpad.org/) a highly customizable open source online editor providing collaborative editing in really real-time. The installation of Etherpad is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Etherpad guide](configuring-playbook-etherpad.md). If you do not wish to set up Etherpad, feel free to skip the `etherpad.` DNS record. The `hydrogen.` subdomain may be necessary, because this playbook could install the [Hydrogen](https://github.com/element-hq/hydrogen-web) web client. The installation of Hydrogen is disabled by default, it is not a core required component. To learn how to install it, see our [configuring Hydrogen guide](configuring-playbook-client-hydrogen.md). If you do not wish to set up Hydrogen, feel free to skip the `hydrogen.` DNS record. diff --git a/docs/configuring-playbook-etherpad.md b/docs/configuring-playbook-etherpad.md index 9ba52ed66..a32125773 100644 --- a/docs/configuring-playbook-etherpad.md +++ b/docs/configuring-playbook-etherpad.md @@ -62,7 +62,7 @@ Then from the plugin manager page (`https://etherpad./admin/plugins This is how it works in Element, it might work quite similar with other clients: -To integrate a standalone etherpad in a room, create your pad by visiting `https://etherpad.DOMAIN`. When the pad opens, copy the URL and send a command like this to the room: `/addwidget URL`. You will then find your integrated Etherpad within the right sidebar in the `Widgets` section. +To integrate a standalone Etherpad in a room, create your pad by visiting `https://etherpad.DOMAIN`. When the pad opens, copy the URL and send a command like this to the room: `/addwidget URL`. You will then find your integrated Etherpad within the right sidebar in the `Widgets` section. ### Set Dimension default to the self-hosted Etherpad (optional) diff --git a/roles/custom/matrix-base/defaults/main.yml b/roles/custom/matrix-base/defaults/main.yml index 3b82d941e..5dce05582 100644 --- a/roles/custom/matrix-base/defaults/main.yml +++ b/roles/custom/matrix-base/defaults/main.yml @@ -86,7 +86,7 @@ matrix_server_fqn_buscarron: "buscarron.{{ matrix_domain }}" # This is where you access the Dimension. matrix_server_fqn_dimension: "dimension.{{ matrix_domain }}" -# This is where you access the etherpad (if enabled via etherpad_enabled; disabled by default). +# This is where you access the Etherpad (if enabled via etherpad_enabled; disabled by default). matrix_server_fqn_etherpad: "etherpad.{{ matrix_domain }}" # For use with Go-NEB! (github callback url for example)