titanz
/
matrix-docker-ansible-deploy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some CI lint errors

Browse Source
development
Julian-Samuel Gebühr 2 years ago
parent 73ebbdcacd
commit d2e6ab6c38
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File

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

@ -4,41 +4,42 @@
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: Generate Maubot proxying configuration for matrix-nginx-proxy - block:
set_fact: - name: Generate Maubot proxying configuration for matrix-nginx-proxy
matrix_bot_maubot_matrix_nginx_proxy_configuration: | ansible.builtin.set_fact:
location ~ ^/(_matrix/maubot/.*) { matrix_bot_maubot_matrix_nginx_proxy_configuration: |
{% if matrix_nginx_proxy_enabled|default(False) %} location ~ ^/(_matrix/maubot/.*) {
{# Use the embedded DNS resolver in Docker containers to discover the service #} {% if matrix_nginx_proxy_enabled|default(False) %}
resolver 127.0.0.11 valid=5s; {# Use the embedded DNS resolver in Docker containers to discover the service #}
set $backend "matrix-bot-maubot:29316/$1"; resolver 127.0.0.11 valid=5s;
proxy_pass http://$backend; set $backend "matrix-bot-maubot:29316/$1";
proxy_set_header Upgrade $http_upgrade; proxy_pass http://$backend;
proxy_set_header Connection "upgrade"; proxy_set_header Upgrade $http_upgrade;
{% else %} proxy_set_header Connection "upgrade";
{# Generic configuration for use outside of our container setup #} {% else %}
proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}/$1; {# Generic configuration for use outside of our container setup #}
proxy_set_header Upgrade $http_upgrade; proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}/$1;
proxy_set_header Connection "upgrade"; proxy_set_header Upgrade $http_upgrade;
{% endif %} 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 - name: Register Maubot's proxying configuration with matrix-nginx-proxy
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]
}} }}
when: matrix_bot_maubot_proxy_management_interface|bool when: matrix_bot_maubot_proxy_management_interface|bool
- name: Warn about reverse-proxying if matrix-nginx-proxy not used - name: Warn about reverse-proxying if matrix-nginx-proxy not used
debug: ansible.builtin.debug:
msg: >- msg: >-
NOTE: You've enabled Maubot but are not using the matrix-nginx-proxy NOTE: You've enabled Maubot but are not using the matrix-nginx-proxy
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"

Write Preview
Loading…
Cancel
Save