Просмотр исходного кода

Further Integrate Code Review Feedback

pull/3941/head
Catalan Lover 1 год назад
committed by Catalan Lover
Родитель
Сommit
8045f232e2
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: 649BCCF930C07F70
3 измененных файлов: 6 добавлений и 8 удалений
  1. +1
    -3
      docs/configuring-playbook-appservice-draupnir-for-all.md
  2. +2
    -2
      docs/configuring-playbook-bot-draupnir.md
  3. +3
    -3
      roles/custom/matrix-bot-draupnir/defaults/main.yml

+ 1
- 3
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. Next, set an alias to the management room.


This alias can be anything you want.

## Adjusting the playbook configuration ## 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`. 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


<!-- NOTE: let this conservative command run (instead of install-all) to make it clear that failure of the command means something is clearly broken. --> <!-- NOTE: let this conservative command run (instead of install-all) to make it clear that failure of the command means something is clearly broken. -->
```sh ```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**: **Notes**:


+ 2
- 2
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. 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. 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


<!-- NOTE: let this conservative command run (instead of install-all) to make it clear that failure of the command means something is clearly broken. --> <!-- NOTE: let this conservative command run (instead of install-all) to make it clear that failure of the command means something is clearly broken. -->
```sh ```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**: **Notes**:


+ 3
- 3
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 # Whether Draupnir should talk to the homeserver through Pantalaimon
# If true, then other variables must be provided including pointing # If true, then other variables must be provided including pointing
# `matrix_bot_draupnir_homeserver_url` to the Pantalaimon URL. # `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 matrix_bot_draupnir_pantalaimon_use: false


# If you choose to accept the risks of using Pantalaimon in your installation # If you choose to accept the risks of using Pantalaimon in your installation


Загрузка…
Отмена
Сохранить