mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-12 08:43:55 +02:00
735bacca89
These `init.yml` (now `inject_into_nginx_proxy.yml`) tasks do not need to `always` run. They only need to run for `setup-all` and `setup-nginx-proxy`. Unless we're dealing with these 2 tags, we can spare ourselves a lot of work. This patch also moves the `when` statement from `init.yml` into `main.yml` in an effort to further optimize things by potentially avoiding the extra file include.
45 lines
2.0 KiB
YAML
45 lines
2.0 KiB
YAML
---
|
|
|
|
- block:
|
|
- name: Fail if matrix-nginx-proxy role already executed
|
|
ansible.builtin.fail:
|
|
msg: >-
|
|
Trying to append Cactus Comment's reverse-proxying configuration to matrix-nginx-proxy,
|
|
but it's pointless since the matrix-nginx-proxy role had already executed.
|
|
To fix this, please change the order of roles in your playbook,
|
|
so that the matrix-nginx-proxy role would run after the matrix-cactus-comments role.
|
|
when: matrix_nginx_proxy_role_executed | default(False) | bool
|
|
|
|
- name: Mount volume
|
|
ansible.builtin.set_fact:
|
|
matrix_nginx_proxy_container_additional_volumes: >
|
|
{{
|
|
matrix_nginx_proxy_container_additional_volumes | default([])
|
|
+
|
|
[{"src": "{{ matrix_cactus_comments_client_path }}", "dst": "/cactus-comments/cactus-comments", "options": "ro"}]
|
|
}}
|
|
|
|
- name: Generate Cactus Comment proxying configuration for matrix-nginx-proxy
|
|
ansible.builtin.set_fact:
|
|
matrix_cactus_comments_nginx_proxy_configuration: |
|
|
location {{ matrix_cactus_comments_client_endpoint }} {
|
|
root {{ matrix_cactus_comments_client_nginx_path }};
|
|
}
|
|
|
|
- name: Register Cactus Comment 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_cactus_comments_nginx_proxy_configuration]
|
|
}}
|
|
|
|
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
|
ansible.builtin.debug:
|
|
msg: >-
|
|
NOTE: You've enabled Cactus Comments but are not using the matrix-nginx-proxy
|
|
reverse proxy.
|
|
Please make sure that you're proxying client files in {{ matrix_cactus_comments_client_path }} correctly
|
|
when: "not matrix_nginx_proxy_enabled | default(False) | bool"
|