From a4bfb9611ec7b0f3636116fc65ebd0cc85e16bbf Mon Sep 17 00:00:00 2001 From: Suguru Hirahara Date: Fri, 11 Oct 2024 15:48:08 +0900 Subject: [PATCH] Fix capitalization: conduit -> Conduit Signed-off-by: Suguru Hirahara --- docs/configuring-playbook-conduit.md | 4 ++-- group_vars/matrix_servers | 2 +- roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/configuring-playbook-conduit.md b/docs/configuring-playbook-conduit.md index 79964dcd9..632d2e150 100644 --- a/docs/configuring-playbook-conduit.md +++ b/docs/configuring-playbook-conduit.md @@ -29,11 +29,11 @@ However, since Conduit is difficult (see [famedly/conduit#276](https://gitlab.co ## Configuring bridges / appservices -Automatic appservice setup is currently unsupported when using conduit. After setting up the service as usual you may notice that it is unable to start. +Automatic appservice setup is currently unsupported when using Conduit. After setting up the service as usual you may notice that it is unable to start. You will have to manually register appservices using the the [register-appservice](https://gitlab.com/famedly/conduit/-/blob/next/APPSERVICES.md) command. -Find the `registration.yaml` in the `/matrix` directory, for example `/matrix/mautrix-signal/bridge/registration.yaml`, then pass the content to conduit: +Find the `registration.yaml` in the `/matrix` directory, for example `/matrix/mautrix-signal/bridge/registration.yaml`, then pass the content to Conduit: @conduit:your.server.name: register-appservice diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 4a3c67c28..3108ba107 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -228,7 +228,7 @@ matrix_addons_homeserver_container_network: "{{ matrix_playbook_reverse_proxy_co matrix_addons_homeserver_client_api_url: "{{ ('http://' + matrix_playbook_reverse_proxy_hostname + ':' + matrix_playbook_internal_matrix_client_api_traefik_entrypoint_port | string) if matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled else matrix_homeserver_container_url }}" matrix_addons_homeserver_systemd_services_list: "{{ ([traefik_identifier + '.service'] if matrix_playbook_reverse_proxy_type == 'playbook-managed-traefik' else []) if matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled else matrix_homeserver_systemd_services_list }}" -# Starting from version `0.6.0` conduit natively supports some sync v3 (sliding-sync) features. +# Starting from version `0.6.0` Conduit natively supports some sync v3 (sliding-sync) features. matrix_homeserver_sliding_sync_url: "{{ matrix_sliding_sync_base_url if matrix_sliding_sync_enabled else (matrix_homeserver_url if matrix_homeserver_implementation in ['conduit'] else '') }}" ######################################################################## diff --git a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml index eece1fab9..6e691c163 100644 --- a/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml +++ b/roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml @@ -153,6 +153,6 @@ matrix_mautrix_discord_bridge_encryption_allow: "{{ matrix_bridges_encryption_en matrix_mautrix_discord_bridge_encryption_default: "{{ matrix_bridges_encryption_default }}" matrix_mautrix_discord_bridge_encryption_key_sharing_allow: "{{ matrix_mautrix_discord_bridge_encryption_allow }}" -# On conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge. +# On Conduit versions before 0.5.0 this option prevented users from joining spaces created by the bridge. # Setting this to false fixed the issue. matrix_mautrix_discord_bridge_restricted_rooms: true