pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Uncomment unintentionally-commented logic

Browse source
This commit is contained in:
Slavi Pantaleev 2019-01-28 14:25:03 +02:00
parent 9438402f61
commit 3e8a4159e6
1 changed files with 56 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

112
roles/matrix-synapse/tasks/ext/mautrix-telegram/setup.yml
View file

@ -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 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" when: "matrix_mautrix_telegram_enabled and mautrix_telegram_registration_file.stat.exists == False"
# - set_fact: - set_fact:
# matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml' matrix_synapse_app_service_config_file_mautrix_telegram: '/app-registration/mautrix-telegram.yml'
# - set_fact: - set_fact:
# matrix_synapse_container_additional_volumes: > matrix_synapse_container_additional_volumes: >
# {{ 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'}] }} {{ [{'src': '{{ matrix_mautrix_telegram_base_path }}/registration.yaml', 'dst': '{{ matrix_synapse_app_service_config_file_mautrix_telegram }}', 'options': 'ro'}] }}
# when: "matrix_mautrix_telegram_enabled" when: "matrix_mautrix_telegram_enabled"
# - set_fact: - set_fact:
# matrix_synapse_app_service_config_files: > matrix_synapse_app_service_config_files: >
# {{ matrix_synapse_app_service_config_files }} {{ matrix_synapse_app_service_config_files }}
# + +
# {{ ["{{ matrix_synapse_app_service_config_file_mautrix_telegram }}"] | to_nice_json }} {{ ["{{ matrix_synapse_app_service_config_file_mautrix_telegram }}"] | to_nice_json }}
# when: "matrix_mautrix_telegram_enabled" when: "matrix_mautrix_telegram_enabled"
# - block: - block:
# - name: Fail if matrix-nginx-proxy role already executed - name: Fail if matrix-nginx-proxy role already executed
# fail: fail:
# msg: > msg: >
# Trying to append Mautrix Telegram's reverse-proxying configuration to matrix-nginx-proxy, 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. 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, 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. so that the matrix-nginx-proxy role would run after the matrix-synapse role.
# when: "matrix_nginx_proxy_role_executed" when: "matrix_nginx_proxy_role_executed"
# - name: Generate Mautrix Telegram proxying configuration for matrix-nginx-proxy - name: Generate Mautrix Telegram proxying configuration for matrix-nginx-proxy
# set_fact: set_fact:
# matrix_mautrix_telegram_matrix_nginx_proxy_configuration: | matrix_mautrix_telegram_matrix_nginx_proxy_configuration: |
# location {{ matrix_mautrix_telegram_public_endpoint }} { location {{ matrix_mautrix_telegram_public_endpoint }} {
# {% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}
# {# Use the embedded DNS resolver in Docker containers to discover the service #} {# Use the embedded DNS resolver in Docker containers to discover the service #}
# resolver 127.0.0.11 valid=5s; resolver 127.0.0.11 valid=5s;
# set $backend "matrix-mautrix-telegram:8080"; set $backend "matrix-mautrix-telegram:8080";
# proxy_pass http://$backend; proxy_pass http://$backend;
# {% else %} {% else %}
# {# Generic configuration for use outside of our container setup #} {# Generic configuration for use outside of our container setup #}
# proxy_pass http://localhost:8080; proxy_pass http://localhost:8080;
# {% endif %} {% endif %}
# } }
# - name: Register Mautrix Telegram proxying configuration with matrix-nginx-proxy - name: Register Mautrix Telegram proxying configuration with matrix-nginx-proxy
# set_fact: 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 matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks
# + +
# [matrix_mautrix_telegram_matrix_nginx_proxy_configuration] [matrix_mautrix_telegram_matrix_nginx_proxy_configuration]
# }} }}
# when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled|default(False)" when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled|default(False)"
# tags: tags:
# - always - always
# - name: Warn about reverse-proxying if matrix-nginx-proxy not used - name: Warn about reverse-proxying if matrix-nginx-proxy not used
# debug: debug:
# msg: > msg: >
# NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy NOTE: You've enabled the Mautrix Telegram bridge but are not using the matrix-nginx-proxy
# reverse proxy. reverse proxy.
# Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}` Please make sure that you're proxying the `{{ matrix_mautrix_telegram_public_endpoint }}`
# URL endpoint to the matrix-mautrix-telegram container. URL endpoint to the matrix-mautrix-telegram container.
# when: "matrix_mautrix_telegram_enabled and matrix_nginx_proxy_enabled is not defined" 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) # Tasks related to getting rid of matrix-mautrix-telegram (if it was previously enabled)