Uncomment unintentionally-commented logic
This commit is contained in:
parent
9438402f61
commit
3e8a4159e6
|
@ -41,69 +41,69 @@
|
|||
shell: /usr/bin/docker run --rm --name matrix-mautrix-telegram-gen -v {{ matrix_mautrix_telegram_base_path }}:/data:z {{ matrix_mautrix_telegram_docker_image }} python3 -m mautrix_telegram -g -c /data/config.yaml -r /data/registration.yaml
|
||||
when: "matrix_mautrix_telegram_enabled and mautrix_telegram_registration_file.stat.exists == False"
|
||||
|
||||
# - set_fact:
|
||||
# matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml'
|
||||
- set_fact:
|
||||
matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml'
|
||||
|
||||
# - set_fact:
|
||||
# matrix_synapse_container_additional_volumes: >
|
||||
# {{ matrix_synapse_container_additional_volumes }}
|
||||
# +
|
||||
# {{ [{'src': '{{ matrix_mautrix_telegram_base_path }}/registration.yaml', 'dst': '{{ matrix_synapse_app_service_config_file_mautrix_telegram }}', 'options': 'ro'}] }}
|
||||
# when: "matrix_mautrix_telegram_enabled"
|
||||
- set_fact:
|
||||
matrix_synapse_container_additional_volumes: >
|
||||
{{ matrix_synapse_container_additional_volumes }}
|
||||
+
|
||||
{{ [{'src': '{{ matrix_mautrix_telegram_base_path }}/registration.yaml', 'dst': '{{ matrix_synapse_app_service_config_file_mautrix_telegram }}', 'options': 'ro'}] }}
|
||||
when: "matrix_mautrix_telegram_enabled"
|
||||
|
||||
# - set_fact:
|
||||
# matrix_synapse_app_service_config_files: >
|
||||
# {{ matrix_synapse_app_service_config_files }}
|
||||
# +
|
||||
# {{ ["{{ matrix_synapse_app_service_config_file_mautrix_telegram }}"] | to_nice_json }}
|
||||
# when: "matrix_mautrix_telegram_enabled"
|
||||
- set_fact:
|
||||
matrix_synapse_app_service_config_files: >
|
||||
{{ matrix_synapse_app_service_config_files }}
|
||||
+
|
||||
{{ ["{{ matrix_synapse_app_service_config_file_mautrix_telegram }}"] | to_nice_json }}
|
||||
when: "matrix_mautrix_telegram_enabled"
|
||||
|
||||
# - block:
|
||||
# - name: Fail if matrix-nginx-proxy role already executed
|
||||
# fail:
|
||||
# msg: >
|
||||
# Trying to append Mautrix Telegram'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 plabook,
|
||||
# so that the matrix-nginx-proxy role would run after the matrix-synapse role.
|
||||
# when: "matrix_nginx_proxy_role_executed"
|
||||
- block:
|
||||
- name: Fail if matrix-nginx-proxy role already executed
|
||||
fail:
|
||||
msg: >
|
||||
Trying to append Mautrix Telegram'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 plabook,
|
||||
so that the matrix-nginx-proxy role would run after the matrix-synapse role.
|
||||
when: "matrix_nginx_proxy_role_executed"
|
||||
|
||||
# - name: Generate Mautrix Telegram proxying configuration for matrix-nginx-proxy
|
||||
# set_fact:
|
||||
# matrix_mautrix_telegram_matrix_nginx_proxy_configuration: |
|
||||
# location {{ matrix_mautrix_telegram_public_endpoint }} {
|
||||
# {% if matrix_nginx_proxy_enabled %}
|
||||
# {# Use the embedded DNS resolver in Docker containers to discover the service #}
|
||||
# resolver 127.0.0.11 valid=5s;
|
||||
# set $backend "matrix-mautrix-telegram:8080";
|
||||
# proxy_pass http://$backend;
|
||||
# {% else %}
|
||||
# {# Generic configuration for use outside of our container setup #}
|
||||
# proxy_pass http://localhost:8080;
|
||||
# {% endif %}
|
||||
# }
|
||||
- name: Generate Mautrix Telegram proxying configuration for matrix-nginx-proxy
|
||||
set_fact:
|
||||
matrix_mautrix_telegram_matrix_nginx_proxy_configuration: |
|
||||
location {{ matrix_mautrix_telegram_public_endpoint }} {
|
||||
{% if matrix_nginx_proxy_enabled %}
|
||||
{# Use the embedded DNS resolver in Docker containers to discover the service #}
|
||||
resolver 127.0.0.11 valid=5s;
|
||||
set $backend "matrix-mautrix-telegram:8080";
|
||||
proxy_pass http://$backend;
|
||||
{% else %}
|
||||
{# Generic configuration for use outside of our container setup #}
|
||||
proxy_pass http://localhost:8080;
|
||||
{% endif %}
|
||||
}
|
||||
|
||||
# - name: Register Mautrix Telegram proxying configuration with matrix-nginx-proxy
|
||||
# set_fact:
|
||||
# matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
|
||||
# {{
|
||||
# matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks
|
||||
# +
|
||||
# [matrix_mautrix_telegram_matrix_nginx_proxy_configuration]
|
||||
# }}
|
||||
- name: Register Mautrix Telegram proxying configuration with matrix-nginx-proxy
|
||||
set_fact:
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
|
||||
{{
|
||||
matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks
|
||||
+
|
||||
[matrix_mautrix_telegram_matrix_nginx_proxy_configuration]
|
||||
}}
|
||||
|
||||
# when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled|default(False)"
|
||||
# tags:
|
||||
# - always
|
||||
when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled|default(False)"
|
||||
tags:
|
||||
- always
|
||||
|
||||
# - name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
||||
# debug:
|
||||
# msg: >
|
||||
# NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy
|
||||
# reverse proxy.
|
||||
# Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}`
|
||||
# URL endpoint to the matrix-mautrix-telegram container.
|
||||
# when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled is not defined"
|
||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
||||
debug:
|
||||
msg: >
|
||||
NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy
|
||||
reverse proxy.
|
||||
Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}`
|
||||
URL endpoint to the matrix-mautrix-telegram container.
|
||||
when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled is not defined"
|
||||
|
||||
#
|
||||
# Tasks related to getting rid of matrix-mautrix-telegram (if it was previously enabled)
|
||||
|
|
Loading…
Reference in a new issue