cqrenet/matrix-docker-ansible-deploy
5
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2026-08-31 04:53:14 +00:00
Code Issues Wiki Activity

Fix Maubot custom URL prefixes

Browse Source
This commit is contained in:
Slavi Pantaleev
2026-08-29 16:17:09 +03:00
parent d8ab746f69
commit dec548eb6a
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/custom/matrix-bot-maubot/defaults/main.yml
+4 -6
View File
@@ -60,11 +60,9 @@ matrix_bot_maubot_config_path: "{{ matrix_bot_maubot_base_path }}/config"
matrix_bot_maubot_container_src_files_path: "{{ matrix_bot_maubot_base_path }}/docker-src"
matrix_bot_maubot_customized_container_src_files_path: "{{ matrix_bot_maubot_base_path }}/customized-docker-src"
matrix_bot_maubot_bot_server_public_url: "{{ matrix_bot_maubot_scheme }}://{{ matrix_bot_maubot_hostname }}"
matrix_bot_maubot_bot_server_base_path: "{{ '' if matrix_bot_maubot_path_prefix == '/' else matrix_bot_maubot_path_prefix }}/v1"
matrix_bot_maubot_bot_server_ui_base_path: "{{ matrix_bot_maubot_path_prefix }}"
matrix_bot_maubot_bot_server_plugin_base_path: "{{ '' if matrix_bot_maubot_path_prefix == '/' else matrix_bot_maubot_path_prefix }}/plugin/"
matrix_bot_maubot_bot_server_appservice_base_path: "{{ matrix_bot_maubot_bot_server_base_path }}"
matrix_bot_maubot_bot_server_public_url: "{{ matrix_bot_maubot_scheme }}://{{ matrix_bot_maubot_hostname }}{{ '' if matrix_bot_maubot_path_prefix == '/' else matrix_bot_maubot_path_prefix }}"
matrix_bot_maubot_bot_server_ui_base_path: /
matrix_bot_maubot_bot_server_plugin_base_path: /_matrix/maubot/plugin/
matrix_bot_maubot_proxy_management_interface: true
@@ -154,7 +152,7 @@ matrix_bot_maubot_container_labels_traefik_tls_certResolver: default # noqa var
matrix_bot_maubot_container_labels_management_enabled: true
matrix_bot_maubot_container_labels_management_hostname: "{{ matrix_bot_maubot_hostname }}"
matrix_bot_maubot_container_labels_management_prefix: "{{ matrix_bot_maubot_path_prefix }}"
matrix_bot_maubot_container_labels_management_traefik_rule: "Host(`{{ matrix_bot_maubot_container_labels_management_hostname }}`) && PathPrefix(`{{ matrix_bot_maubot_path_prefix }}`)"
matrix_bot_maubot_container_labels_management_traefik_rule: "Host(`{{ matrix_bot_maubot_container_labels_management_hostname }}`) && PathPrefix(`{{ matrix_bot_maubot_container_labels_management_prefix }}`)"
matrix_bot_maubot_container_labels_management_traefik_priority: 0
matrix_bot_maubot_container_labels_management_traefik_entrypoints: "{{ matrix_bot_maubot_container_labels_traefik_entrypoints }}"
matrix_bot_maubot_container_labels_management_traefik_tls: "{{ matrix_bot_maubot_container_labels_management_traefik_entrypoints != 'web' }}"
roles/custom/matrix-bot-maubot/tasks/validate_config.yml
+2
View File
@@ -32,6 +32,8 @@
- {'old': 'matrix_bot_maubot_docker_src_files_path', 'new': 'matrix_bot_maubot_container_src_files_path'}
- {'old': 'matrix_bot_maubot_customized_docker_src_files_path', 'new': 'matrix_bot_maubot_customized_container_src_files_path'}
- {'old': 'matrix_bot_maubot_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
- {'old': 'matrix_bot_maubot_bot_server_base_path', 'new': '<removed> (maubot no longer supports a custom management API path)'}
- {'old': 'matrix_bot_maubot_bot_server_appservice_base_path', 'new': '<removed> (maubot no longer supports a custom appservice API path)'}
- name: Fail if required maubot settings not defined
ansible.builtin.fail:
roles/custom/matrix-bot-maubot/templates/config.yaml.j2
-4
View File
@@ -47,8 +47,6 @@ server:
port: {{ matrix_bot_maubot_server_port | to_json }}
# Public base URL where the server is visible.
public_url: {{ matrix_bot_maubot_bot_server_public_url | to_json }}
# The base management API path.
base_path: {{ matrix_bot_maubot_bot_server_base_path | to_json }}
# The base path for the UI.
ui_base_path: {{ matrix_bot_maubot_bot_server_ui_base_path | to_json }}
# The base path for plugin endpoints. The instance ID will be appended directly.
@@ -56,8 +54,6 @@ server:
# Override path from where to load UI resources.
# Set to false to using pkg_resources to find the path.
override_resource_path: /opt/maubot/frontend
# The base appservice API path. Use / for legacy appservice API and /_matrix/app/v1 for v1.
appservice_base_path: {{ matrix_bot_maubot_bot_server_appservice_base_path | to_json }}
# The shared secret to sign API access tokens.
# Set to "generate" to generate and save a new token at startup.
unshared_secret: {{ matrix_bot_maubot_unshared_secret | to_json }}
roles/custom/matrix-bot-maubot/templates/labels.j2
+4
View File
@@ -27,6 +27,10 @@ traefik.http.routers.matrix-bot-maubot-management.priority={{ matrix_bot_maubot_
{% endif %}
traefik.http.routers.matrix-bot-maubot-management.service=matrix-bot-maubot
{% if matrix_bot_maubot_container_labels_management_prefix != '/' %}
traefik.http.middlewares.matrix-bot-maubot-management-strip-prefix.stripprefix.prefixes={{ matrix_bot_maubot_container_labels_management_prefix }}
traefik.http.routers.matrix-bot-maubot-management.middlewares=matrix-bot-maubot-management-strip-prefix
{% endif %}
traefik.http.routers.matrix-bot-maubot-management.entrypoints={{ matrix_bot_maubot_container_labels_management_traefik_entrypoints }}
traefik.http.routers.matrix-bot-maubot-management.tls={{ matrix_bot_maubot_container_labels_management_traefik_tls | to_json }}