mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-12-25 02:18:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use http_bin_port and make networking clearer

Browse Source
This commit is contained in:
Julian-Samuel Gebühr 2022-07-10 13:33:29 +02:00
parent e62632bf5d
commit ffa20357ea
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
roles/matrix-bot-maubot/defaults/main.yml
View File

@ -36,6 +36,20 @@ matrix_bot_maubot_database_uri: "{{
}[matrix_bot_maubot_database_engine] }[matrix_bot_maubot_database_engine]
}}" }}"
# Defines the port number where the management interface is
# To actually expose the management interface outside of the container, use `matrix_bot_maubot_management_interface_http_bind_port`
matrix_bot_maubot_management_interface_port: 29316
# Controls whether the maubot container exposes its HTTP management interface port (tcp/29316 in the container).
#
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:29316"), or empty string to not expose.
# If you'll be setting this at all, it should be defined in terms of `matrix_bot_maubot_management_interface_port`.
# Example:
# matrix_bot_maubot_management_interface_http_bind_port: "127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}"
matrix_bot_maubot_management_interface_http_bind_port: ''
matrix_bot_maubot_port: 29316 matrix_bot_maubot_port: 29316
matrix_bot_maubot_unshared_secret: 'generate' matrix_bot_maubot_unshared_secret: 'generate'

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

@ -37,7 +37,7 @@
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
{% else %} {% else %}
{# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_port }}/$1; proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}/$1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
{% endif %} {% endif %}

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

@ -27,7 +27,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_expose_management_interface|bool %} {% if matrix_bot_maubot_expose_management_interface|bool %}
-p {{ matrix_bot_maubot_port }}:29316 \ -p {{ matrix_bot_maubot_management_interface_port }}:29316 \
{% endif %} {% endif %}
{{ matrix_bot_maubot_docker_image }} \ {{ matrix_bot_maubot_docker_image }} \
python3 -m maubot -c /data/config.yaml python3 -m maubot -c /data/config.yaml