From 8045f232e2238f86eef431fe8b49fdd10f5efbbf Mon Sep 17 00:00:00 2001 From: Catalan Lover <48515417+FSG-Cat@users.noreply.github.com> Date: Thu, 16 Jan 2025 08:46:18 +0000 Subject: [PATCH] Further Integrate Code Review Feedback --- docs/configuring-playbook-appservice-draupnir-for-all.md | 4 +--- docs/configuring-playbook-bot-draupnir.md | 4 ++-- roles/custom/matrix-bot-draupnir/defaults/main.yml | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docs/configuring-playbook-appservice-draupnir-for-all.md b/docs/configuring-playbook-appservice-draupnir-for-all.md index 0cdccc9ab..be7aacc30 100644 --- a/docs/configuring-playbook-appservice-draupnir-for-all.md +++ b/docs/configuring-playbook-appservice-draupnir-for-all.md @@ -34,8 +34,6 @@ As noted in the Draupnir install instructions the control room is sensitive. **A Next, set an alias to the management room. -This alias can be anything you want. - ## Adjusting the playbook configuration Add the following configuration to your `inventory/host_vars/matrix.example.com/vars.yml` file. Make sure to replace `MANAGEMENT_ROOM_ALIAS_HERE`. @@ -78,7 +76,7 @@ After configuring the playbook, run it with [playbook tags](playbook-tags.md) as ```sh -ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-users-created,start +ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ``` **Notes**: diff --git a/docs/configuring-playbook-bot-draupnir.md b/docs/configuring-playbook-bot-draupnir.md index df016c116..c9b9cb835 100644 --- a/docs/configuring-playbook-bot-draupnir.md +++ b/docs/configuring-playbook-bot-draupnir.md @@ -171,7 +171,7 @@ matrix_bot_draupnir_configuration_extension_yaml: | Replace your `matrix_bot_mjolnir` config with `matrix_bot_draupnir` config. Also disable Mjolnir if you're doing migration. -Note that Pantalaimon is unsupported by Draupnir so its recommended to consult [Native E2EE Support](###Native-E2EE-Support) on how to setup Draupnirs native E2EE support. +Note that Pantalaimon is unsupported by Draupnir so it is recommended to consult the instructions to enable [the native E2EE support](#native-e2ee-support). That is all you need to do due to that Draupnir can complete migration on its own. @@ -181,7 +181,7 @@ After configuring the playbook, run it with [playbook tags](playbook-tags.md) as ```sh -ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,ensure-matrix-users-created,start +ansible-playbook -i inventory/hosts setup.yml --tags=setup-all,start ``` **Notes**: diff --git a/roles/custom/matrix-bot-draupnir/defaults/main.yml b/roles/custom/matrix-bot-draupnir/defaults/main.yml index db2984810..0aa653e6e 100644 --- a/roles/custom/matrix-bot-draupnir/defaults/main.yml +++ b/roles/custom/matrix-bot-draupnir/defaults/main.yml @@ -49,9 +49,9 @@ matrix_bot_draupnir_systemd_wanted_services_list: [] # Whether Draupnir should talk to the homeserver through Pantalaimon # If true, then other variables must be provided including pointing # `matrix_bot_draupnir_homeserver_url` to the Pantalaimon URL. -# This option is discouraged from being used by upstream as it -# breaks core parts of the user experience. Any part of the workflow -# that relies on reactions will break. (Hint: A lot of the workflow relies on them.) +# Enabling this option is discouraged, because Draupnir does not support +# running with Pantalaimon as it would break all workflows that involve answering +# prompts with reactions. (Hint: a lot of workflows rely on them.) matrix_bot_draupnir_pantalaimon_use: false # If you choose to accept the risks of using Pantalaimon in your installation