parent
5f329f72ab
commit
a5618a893b
@ -1,46 +0,0 @@
|
||||
---
|
||||
|
||||
- name: Fail if matrix-nginx-proxy role already executed
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
Trying to append webhooks Appservice'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-bridge-appservice-webhooks role.
|
||||
when: matrix_nginx_proxy_role_executed | default(False) | bool
|
||||
|
||||
- name: Generate Matrix Appservice webhooks proxying configuration for matrix-nginx-proxy
|
||||
ansible.builtin.set_fact:
|
||||
matrix_appservice_webhooks_matrix_nginx_proxy_configuration: |
|
||||
{% if matrix_nginx_proxy_enabled | default(False) %}
|
||||
{# Use the embedded DNS resolver in Docker containers to discover the service #}
|
||||
location ~ ^{{ matrix_appservice_webhooks_public_endpoint }}/(.*)$ {
|
||||
resolver 127.0.0.11 valid=5s;
|
||||
set $backend "matrix-appservice-webhooks:{{ matrix_appservice_webhooks_matrix_port }}";
|
||||
proxy_pass http://$backend/$1;
|
||||
}
|
||||
{% else %}
|
||||
{# Generic configuration for use outside of our container setup #}
|
||||
location {{ matrix_appservice_webhooks_public_endpoint }}/ {
|
||||
proxy_pass http://127.0.0.1:{{ matrix_appservice_webhooks_matrix_port }}/;
|
||||
}
|
||||
{% endif %}
|
||||
|
||||
- name: Register webhooks Appservice 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_appservice_webhooks_matrix_nginx_proxy_configuration]
|
||||
}}
|
||||
|
||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
||||
ansible.builtin.debug:
|
||||
msg: >-
|
||||
NOTE: You've enabled the Matrix webhooks bridge but are not using the matrix-nginx-proxy
|
||||
reverse proxy.
|
||||
Please make sure that you're proxying the `{{ matrix_appservice_webhooks_public_endpoint }}`
|
||||
URL endpoint to the matrix-appservice-webhooks container.
|
||||
You can expose the container's port using the `matrix_appservice_webhooks_container_http_host_bind_port` variable.
|
||||
when: "matrix_appservice_webhooks_enabled | bool and not matrix_nginx_proxy_enabled | default(False) | bool"
|
@ -1,13 +1,16 @@
|
||||
---
|
||||
|
||||
- name: Fail if required settings not defined
|
||||
- name: Fail if required matrix-appservice-webhooks settings not defined
|
||||
ansible.builtin.fail:
|
||||
msg: >-
|
||||
You need to define a required configuration setting (`{{ item }}`).
|
||||
when: "vars[item] == ''"
|
||||
with_items:
|
||||
- "matrix_appservice_webhooks_appservice_token"
|
||||
- "matrix_appservice_webhooks_homeserver_url"
|
||||
- "matrix_appservice_webhooks_homeserver_token"
|
||||
- "matrix_appservice_webhooks_id_token"
|
||||
- "matrix_appservice_webhooks_api_secret"
|
||||
- matrix_appservice_webhooks_appservice_token
|
||||
- matrix_appservice_webhooks_homeserver_url
|
||||
- matrix_appservice_webhooks_homeserver_token
|
||||
- matrix_appservice_webhooks_id_token
|
||||
- matrix_appservice_webhooks_api_secret
|
||||
- matrix_appservice_webhooks_container_network
|
||||
- matrix_appservice_webhooks_hostname
|
||||
- matrix_appservice_webhooks_path_prefix
|
||||
|
@ -0,0 +1,36 @@
|
||||
{% if matrix_appservice_webhooks_container_labels_traefik_enabled %}
|
||||
traefik.enable=true
|
||||
|
||||
{% if matrix_appservice_webhooks_container_labels_traefik_docker_network %}
|
||||
traefik.docker.network={{ matrix_appservice_webhooks_container_labels_traefik_docker_network }}
|
||||
{% endif %}
|
||||
|
||||
{#
|
||||
Start of public
|
||||
#}
|
||||
{% if matrix_appservice_webhooks_container_labels_public_endpoint_enabled %}
|
||||
traefik.http.middlewares.matrix-appservice-webhooks-public-strip-prefix.stripprefix.prefixes={{ matrix_appservice_webhooks_container_labels_public_endpoint_prefix }}
|
||||
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.rule={{ matrix_appservice_webhooks_container_labels_public_endpoint_traefik_rule }}
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.middlewares=matrix-appservice-webhooks-public-strip-prefix
|
||||
|
||||
{% if matrix_appservice_webhooks_container_labels_public_endpoint_traefik_priority | int > 0 %}
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.priority={{ matrix_appservice_webhooks_container_labels_public_endpoint_traefik_priority }}
|
||||
{% endif %}
|
||||
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.service=matrix-appservice-webhooks
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.entrypoints={{ matrix_appservice_webhooks_container_labels_public_endpoint_traefik_entrypoints }}
|
||||
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.tls={{ matrix_appservice_webhooks_container_labels_public_endpoint_traefik_tls | to_json }}
|
||||
{% if matrix_appservice_webhooks_container_labels_public_endpoint_traefik_tls %}
|
||||
traefik.http.routers.matrix-appservice-webhooks-public-endpoint.tls.certResolver={{ matrix_appservice_webhooks_container_labels_public_endpoint_traefik_tls_certResolver }}
|
||||
{% endif %}
|
||||
traefik.http.services.matrix-appservice-webhooks.loadbalancer.server.port={{ matrix_appservice_webhooks_matrix_port }}
|
||||
{% endif %}
|
||||
{#
|
||||
/End of public
|
||||
#}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{{ matrix_appservice_webhooks_container_labels_additional_labels }}
|
Loading…
Reference in new issue