pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix some Jinja2 inconsistencies in maubot role

Browse source
This commit is contained in:
Slavi Pantaleev 2022-07-20 10:27:13 +03:00
parent 1f2d100d91
commit b8832e3014
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/matrix-bot-maubot/tasks/init.yml
View file

@ -3,7 +3,7 @@
- name: Add maubot to the systemd service list - name: Add maubot to the systemd service list
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_systemd_services_list: "{{ matrix_systemd_services_list + ['matrix-bot-maubot.service'] }}" 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 - name: Configure nginx for maubot
block: block:
@ -11,7 +11,7 @@
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_bot_maubot_matrix_nginx_proxy_configuration: | matrix_bot_maubot_matrix_nginx_proxy_configuration: |
location ~ ^/(_matrix/maubot/.*) { 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 #} {# 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:29316/$1";
@ -25,13 +25,13 @@
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
{% endif %} {% 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 - name: Register Maubot's proxying configuration with matrix-nginx-proxy
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: | 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] [matrix_bot_maubot_matrix_nginx_proxy_configuration]
}} }}
@ -44,4 +44,4 @@
reverse proxy. reverse proxy.
Please make sure that you're proxying the `/_matrix/maubot` Please make sure that you're proxying the `/_matrix/maubot`
URL endpoint to the matrix-maubot container. 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"