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

Merge pull request #3998 from luixxiul/fix

Update files for matrix-bridge-hookshot
pull/4001/head
Slavi Pantaleev 1 год назад
committed by GitHub
Родитель
Сommit
30be63d4b0
Не найден GPG ключ соответствующий данной подписи Идентификатор GPG ключа: B5690EEEBB952194
3 измененных файлов: 22 добавлений и 4 удалений
  1. +20
    -2
      docs/configuring-playbook-bridge-hookshot.md
  2. +2
    -2
      roles/custom/matrix-bridge-hookshot/defaults/main.yml
  3. +0
    -0
      roles/custom/matrix-bridge-hookshot/templates/config.yaml.j2

+ 20
- 2
docs/configuring-playbook-bridge-hookshot.md Просмотреть файл

@@ -38,7 +38,12 @@ Take special note of the `matrix_hookshot_*_enabled` variables. Services that ne

### Extending the configuration

You can configure additional options by adding the `matrix_hookshot_configuration_extension_yaml` and `matrix_hookshot_registration_extension_yaml` variables.
There are some additional things you may wish to configure about the bridge.

Take a look at:

- `roles/custom/matrix-bridge-hookshot/defaults/main.yml` for some variables that you can customize via your `vars.yml` file
- `roles/custom/matrix-bridge-hookshot/templates/config.yaml.j2` for the bridge's default configuration. You can override settings (even those that don't have dedicated playbook variables) using the `matrix_hookshot_configuration_extension_yaml` and `matrix_hookshot_registration_extension_yaml` variables

Refer the [official instructions](https://matrix-org.github.io/matrix-hookshot/latest/setup.html) and the comments in [main.yml](../roles/custom/matrix-bridge-hookshot/defaults/main.yml) to learn what the individual options do.

@@ -93,7 +98,7 @@ Unless indicated otherwise, the following endpoints are reachable on your `matri
| widgets | `/hookshot/widgetapi/` | `matrix_hookshot_widgets_endpoint` | Widgets |
| metrics | `/metrics/hookshot` | `matrix_hookshot_metrics_enabled` and exposure enabled via `matrix_hookshot_metrics_proxying_enabled` or `matrix_metrics_exposure_enabled`. Read more in the [Metrics section](#metrics) below. | Prometheus |

Also see the various `matrix_hookshot_container_labels_*` variables in [main.yml](../roles/custom/matrix-bridge-hookshot/defaults/main.yml), which expose URLs publicly
Also see the various `matrix_hookshot_container_labels_*` variables in [main.yml](../roles/custom/matrix-bridge-hookshot/defaults/main.yml), which expose URLs publicly.

The different listeners are also reachable *internally* in the docker-network via the container's name (configured by `matrix_hookshot_container_url`) and on different ports (e.g. `matrix_hookshot_appservice_port`). Read [main.yml](../roles/custom/matrix-bridge-hookshot/defaults/main.yml) in detail for more info.

@@ -138,3 +143,16 @@ Whichever one you go with, by default metrics are exposed publicly **without** p
### Collision with matrix-appservice-webhooks

If you are also running [matrix-appservice-webhooks](configuring-playbook-bridge-appservice-webhooks.md), it reserves its namespace by the default setting `matrix_appservice_webhooks_user_prefix: '_webhook_'`. You should take care if you modify its or hookshot's prefix that they do not collide with each other's namespace (default `matrix_hookshot_generic_userIdPrefix: '_webhooks_'`).

## Troubleshooting

As with all other services, you can find the logs in [systemd-journald](https://www.freedesktop.org/software/systemd/man/systemd-journald.service.html) by logging in to the server with SSH and running `journalctl -fu matrix-bridge-hookshot`.

### Increase logging verbosity

The default logging level for this component is `warn`. If you want to increase the verbosity, add the following configuration to your `vars.yml` file and re-run the playbook:

```yaml
# Valid values: error, warn, info, debug
matrix_hookshot_logging_level: debug
```

+ 2
- 2
roles/custom/matrix-bridge-hookshot/defaults/main.yml Просмотреть файл

@@ -183,7 +183,7 @@ matrix_hookshot_provisioning_internal: "/v1"
matrix_hookshot_provisioning_hostname: "{{ matrix_hookshot_public_hostname }}"
matrix_hookshot_provisioning_endpoint: "{{ matrix_hookshot_public_endpoint }}{{ matrix_hookshot_provisioning_internal }}"

# Valid logging levels are: debug, info, warn, error
# Valid values: error, warn, info, debug
matrix_hookshot_logging_level: warn

matrix_hookshot_widgets_enabled: true
@@ -330,7 +330,7 @@ matrix_hookshot_homeserver_token: ''
#
# For a more advanced customization, you can extend the default (see `matrixhookshot_configuration_extension_yaml`)
# or completely replace this variable with your own template.
matrix_hookshot_configuration_yaml: "{{ lookup('template', 'templates/config.yml.j2') }}"
matrix_hookshot_configuration_yaml: "{{ lookup('template', 'templates/config.yaml.j2') }}"

matrix_hookshot_configuration_extension_yaml: |
# Your custom YAML configuration goes here.


roles/custom/matrix-bridge-hookshot/templates/config.yml.j2 → roles/custom/matrix-bridge-hookshot/templates/config.yaml.j2 Просмотреть файл


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