Преглед на файлове

Fix capitalization: conduit -> Conduit

Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org>
pull/3595/head
Suguru Hirahara преди 1 година
родител
ревизия
a4bfb9611e
No known key found for this signature in database GPG ключ ID: E4F9743DAB4B7B75
променени са 3 файла, в които са добавени 4 реда и са изтрити 4 реда
  1. +2
    -2
      docs/configuring-playbook-conduit.md
  2. +1
    -1
      group_vars/matrix_servers
  3. +1
    -1
      roles/custom/matrix-bridge-mautrix-discord/defaults/main.yml

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


+ 1
- 1
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 '') }}"

########################################################################


+ 1
- 1
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

Зареждане…
Отказ
Запис