mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-12 08:43:55 +02:00
Fix some Jinja2 inconsistencies in maubot role
This commit is contained in:
parent
1f2d100d91
commit
b8832e3014
@ -3,7 +3,7 @@
|
||||
- name: Add maubot to the systemd service list
|
||||
ansible.builtin.set_fact:
|
||||
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-maubot.service'] }}"
|
||||
when: matrix_bot_maubot_enabled|bool
|
||||
when: matrix_bot_maubot_enabled | bool
|
||||
|
||||
- name: Configure nginx for maubot
|
||||
block:
|
||||
@ -11,7 +11,7 @@
|
||||
ansible.builtin.set_fact:
|
||||
matrix_bot_maubot_matrix_nginx_proxy_configuration: |
|
||||
location ~ ^/(_matrix/maubot/.*) {
|
||||
{% 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 #}
|
||||
resolver 127.0.0.11 valid=5s;
|
||||
set $backend "matrix-bot-maubot:29316/$1";
|
||||
@ -25,13 +25,13 @@
|
||||
proxy_set_header Connection "upgrade";
|
||||
{% endif %}
|
||||
}
|
||||
when: matrix_bot_maubot_proxy_management_interface|bool
|
||||
when: matrix_bot_maubot_proxy_management_interface | bool
|
||||
|
||||
- name: Register Maubot's proxying configuration with matrix-nginx-proxy
|
||||
ansible.builtin.set_fact:
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
|
||||
{{
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks|default([])
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks | default([])
|
||||
+
|
||||
[matrix_bot_maubot_matrix_nginx_proxy_configuration]
|
||||
}}
|
||||
@ -44,4 +44,4 @@
|
||||
reverse proxy.
|
||||
Please make sure that you're proxying the `/_matrix/maubot`
|
||||
URL endpoint to the matrix-maubot container.
|
||||
when: "matrix_bot_maubot_enabled|bool and matrix_bot_maubot_proxy_management_interface|bool and matrix_nginx_proxy_enabled is not defined"
|
||||
when: "matrix_bot_maubot_enabled | bool and matrix_bot_maubot_proxy_management_interface | bool and matrix_nginx_proxy_enabled is not defined"
|
||||
|
Loading…
Reference in New Issue
Block a user