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

Fix Cactus Comments nginx injection when matrix-nginx-proxy disabled

Browse Source 
Fixes https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/2101

Related to https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/2089
This commit is contained in:
Slavi Pantaleev 2022-09-14 20:44:35 +03:00
parent 2763b9b854
commit fde5fef8b3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/matrix-cactus-comments/tasks/init.yml
View File

@ -35,17 +35,18 @@
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_nginx_proxy_container_additional_volumes: > matrix_nginx_proxy_container_additional_volumes: >
{{ {{
matrix_nginx_proxy_container_additional_volumes | default([]) matrix_nginx_proxy_container_additional_volumes | default([])
+ +
[{"src": "{{ matrix_cactus_comments_client_path }}", "dst": "/cactus-comments/cactus-comments", "options": "ro"}] [{"src": "{{ matrix_cactus_comments_client_path }}", "dst": "/cactus-comments/cactus-comments", "options": "ro"}]
}} }}
- name: Generate Cactus Comment proxying configuration for matrix-nginx-proxy - name: Generate Cactus Comment proxying configuration for matrix-nginx-proxy
ansible.builtin.set_fact: ansible.builtin.set_fact:
matrix_cactus_comments_nginx_proxy_configuration: | matrix_cactus_comments_nginx_proxy_configuration: |
location {{ matrix_cactus_comments_client_endpoint }} { location {{ matrix_cactus_comments_client_endpoint }} {
root {{ matrix_cactus_comments_client_nginx_path }}; root {{ matrix_cactus_comments_client_nginx_path }};
} }
when: "matrix_nginx_proxy_enabled | default(False) | bool"
- name: Register Cactus Comment proxying configuration with matrix-nginx-proxy - name: Register Cactus Comment 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: |
@ -54,6 +55,7 @@
+ +
[matrix_cactus_comments_nginx_proxy_configuration] [matrix_cactus_comments_nginx_proxy_configuration]
}} }}
- name: Warn about reverse-proxying if matrix-nginx-proxy not used - name: Warn about reverse-proxying if matrix-nginx-proxy not used
ansible.builtin.debug: ansible.builtin.debug:
msg: >- msg: >-