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

Make use of matrix_bot_maubot_management_interface_port variable to actually make maubot port configurable

Browse Source 
Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/1894
This commit is contained in:
Slavi Pantaleev
2022-07-20 13:06:11 +03:00
parent 8a689813ff
commit 90551e82ec
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-bot-maubot/tasks/init.yml
View File

@@ -14,7 +14,7 @@
{% if matrix_nginx_proxy_enabled | default(False) %} {% if matrix_nginx_proxy_enabled | default(False) %}
{# Use the embedded DNS resolver in Docker containers to discover the service #} {# Use the embedded DNS resolver in Docker containers to discover the service #}
resolver 127.0.0.11 valid=5s; resolver 127.0.0.11 valid=5s;
set $backend "matrix-bot-maubot:29316/$1"; set $backend "matrix-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}/$1";
proxy_pass http://$backend; proxy_pass http://$backend;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";

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

@@ -32,7 +32,7 @@ plugin_databases:
server: server:
# The IP and port to listen to. # The IP and port to listen to.
hostname: 0.0.0.0 hostname: 0.0.0.0
port: 29316 port: {{ matrix_bot_maubot_management_interface_port|to_json }}
# Public base URL where the server is visible. # 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. # The base management API path.

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

@@ -28,7 +28,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-bot-maubot \
{% endfor %} {% endfor %}
--network={{ matrix_docker_network }} \ --network={{ matrix_docker_network }} \
{% if matrix_bot_maubot_management_interface_http_bind_port %} {% if matrix_bot_maubot_management_interface_http_bind_port %}
-p {{ matrix_bot_maubot_management_interface_http_bind_port }}:29316 -p {{ matrix_bot_maubot_management_interface_http_bind_port }}:{{ matrix_bot_maubot_management_interface_port }}
{% endif %} {% endif %}
{{ matrix_bot_maubot_docker_image }} \ {{ matrix_bot_maubot_docker_image }} \
python3 -m maubot -c /config/config.yaml python3 -m maubot -c /config/config.yaml