From 47c783b22646dc324f80f00f9bf23f8738ba80dd Mon Sep 17 00:00:00 2001 From: daladim Date: Mon, 20 Dec 2021 18:55:30 +0100 Subject: [PATCH 1/3] [README] instance_path is not configurable --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 1de91b7..2fb7c5f 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Go to the desired repository's webhooks settings, in Gitlab, under **Your repo** Configure the **URL** as follows: ```sh -https://${server_name}/${plugin_base_path}/${instance_id}/${instance_path}?room=${room_id} +https://${server_name}/${plugin_base_path}/${instance_id}/webhooks?room=${room_id} ``` Where @@ -59,7 +59,6 @@ Where - `${server_name}` is an ip address or domain name where your Maubot instance is reachable - `${base_path}` is the base path for plugin endpoint as configured under `server.plugin_base_path` in `config.yaml` - `${instance_id}` is the identifier you previously defined while setting up the plugin instance, here `my_gitlab_bot` -- `${instance_path}` is the `path` defined in **Maubot Manager** > **Instances** > `my_gitlab_bot` > `path` - `${room_id}` is the Matrix room identifier as defined in its URL, or under **Room Settings** > **Advanced** > **Internal room identifier** Which gives for example, with the default configuration: . From 554d07655c6ba08a325ea88d0efe2ba842cd1820 Mon Sep 17 00:00:00 2001 From: daladim Date: Mon, 20 Dec 2021 18:55:58 +0100 Subject: [PATCH 2/3] [README] Where to find the secret --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fb7c5f..28a64c9 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ Where Which gives for example, with the default configuration: . -Then configure the `secret` token as previously defined. +As `secret`, set the token shown in Maubot's **Instances** > **my_gitlab_bot** > **secret:** Afterwhile, configure the desired permissions, [enable SSL verification if needed](https://docs.gitlab.com/ee/user/project/integrations/webhooks.html#ssl-verification) and create the webhook. From 79e8d850e0d1b790533e1b2f23a0ba06413e31bf Mon Sep 17 00:00:00 2001 From: daladim Date: Mon, 20 Dec 2021 19:06:29 +0100 Subject: [PATCH 3/3] [README] Room ID --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28a64c9..84ae710 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Where - `${server_name}` is an ip address or domain name where your Maubot instance is reachable - `${base_path}` is the base path for plugin endpoint as configured under `server.plugin_base_path` in `config.yaml` - `${instance_id}` is the identifier you previously defined while setting up the plugin instance, here `my_gitlab_bot` -- `${room_id}` is the Matrix room identifier as defined in its URL, or under **Room Settings** > **Advanced** > **Internal room identifier** +- `${room_id}` is the Matrix room identifier as defined in its URL (or, if you're using the Element client) under **Room Settings** > **Advanced** > **Internal room identifier**. Make sure to use a room where the Gitlab bot is invited, otherwise the webhook will fail with an HTTP 403 error. Which gives for example, with the default configuration: .