finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move matrix-bot-maubot to its own container network and add native Traefik support

Browse Source
This commit is contained in:
Slavi Pantaleev
2024-01-07 10:16:42 +02:00
parent 6deb99f31b
commit c5006c3ac2
9 changed files with 157 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/custom/matrix-bot-maubot/templates/config/config.yaml.j2
View File

@ -35,23 +35,23 @@ plugin_databases:
server:
# The IP and port to listen to.
hostname: 0.0.0.0
port: {{ matrix_bot_maubot_management_interface_port|to_json }}
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 }}
public_url: {{ matrix_bot_maubot_bot_server_public_url | to_json }}
# The base management API path.
base_path: /_matrix/maubot/v1
base_path: {{ matrix_bot_maubot_bot_server_base_path | to_json }}
# The base path for the UI.
ui_base_path: /_matrix/maubot
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.
plugin_base_path: /_matrix/maubot/plugin/
plugin_base_path: {{ matrix_bot_maubot_bot_server_plugin_base_path | to_json }}
# 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/app/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 }}
unshared_secret: {{ matrix_bot_maubot_unshared_secret | to_json }}
# Known homeservers. This is required for the `mbc auth` command and also allows
# more convenient access from the management UI. This is not required to create

25
roles/custom/matrix-bot-maubot/templates/labels.j2 Normal file
View File

@ -0,0 +1,25 @@
{% if matrix_bot_maubot_container_labels_traefik_enabled %}
traefik.enable=true
{% if matrix_bot_maubot_container_labels_traefik_docker_network %}
traefik.docker.network={{ matrix_bot_maubot_container_labels_traefik_docker_network }}
{% endif %}
{# Management #}
{% if matrix_bot_maubot_container_labels_management_enabled %}
traefik.http.routers.matrix-bot-maubot-management.rule={{ matrix_bot_maubot_container_labels_management_traefik_rule }}
{% if matrix_bot_maubot_container_labels_management_traefik_priority | int > 0 %}
traefik.http.routers.matrix-bot-maubot-management.priority={{ matrix_bot_maubot_container_labels_management_traefik_priority }}
{% endif %}
traefik.http.routers.matrix-bot-maubot-management.service=matrix-mautrix-facebook-appservice
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 }}
{% if matrix_bot_maubot_container_labels_management_traefik_tls %}
traefik.http.routers.matrix-bot-maubot-management.tls.certResolver={{ matrix_bot_maubot_container_labels_management_traefik_tls_certResolver }}
{% endif %}
traefik.http.services.matrix-mautrix-facebook-appservice.loadbalancer.server.port={{ matrix_bot_maubot_server_port }}
{% endif %}
{% endif %}
{{ matrix_bot_maubot_container_labels_additional_labels }}

15
roles/custom/matrix-bot-maubot/templates/systemd/matrix-bot-maubot.service.j2
View File

@ -16,23 +16,32 @@ Environment="HOME={{ devture_systemd_docker_base_systemd_unit_home_path }}"
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-maubot 2>/dev/null || true'
ExecStartPre=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-maubot 2>/dev/null || true'
ExecStart={{ devture_systemd_docker_base_host_command_docker }} run --rm --name matrix-bot-maubot \
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
--rm \
--name=matrix-bot-maubot \
--log-driver=none \
--user={{ matrix_user_uid }}:{{ matrix_user_gid }} \
--read-only \
--cap-drop=ALL \
--mount type=bind,src={{ matrix_bot_maubot_config_path }},dst=/config,ro \
--mount type=bind,src={{ matrix_bot_maubot_data_path }},dst=/data \
--label-file={{ matrix_bot_maubot_base_path }}/labels \
{% for arg in matrix_bot_maubot_container_extra_arguments %}
{{ arg }} \
{% endfor %}
--network={{ matrix_docker_network }} \
{% if matrix_bot_maubot_management_interface_http_bind_port %}
-p {{ matrix_bot_maubot_management_interface_http_bind_port }}:{{ matrix_bot_maubot_management_interface_port }} \
{% if matrix_bot_maubot_container_management_interface_http_bind_port %}
-p {{ matrix_bot_maubot_container_management_interface_http_bind_port }}:{{ matrix_bot_maubot_server_port }} \
{% endif %}
{{ matrix_bot_maubot_docker_image }} \
python3 -m maubot -c /config/config.yaml --no-update
{% for network in matrix_bot_maubot_container_additional_networks %}
ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} network connect {{ network }} matrix-bot-maubot
{% endfor %}
ExecStart={{ devture_systemd_docker_base_host_command_docker }} start --attach matrix-bot-maubot
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} stop --time={{ devture_systemd_docker_base_container_stop_grace_time_seconds }} matrix-bot-maubot 2>/dev/null || true'
ExecStop=-{{ devture_systemd_docker_base_host_command_sh }} -c '{{ devture_systemd_docker_base_host_command_docker }} rm matrix-bot-maubot 2>/dev/null || true'
Restart=always