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

Use container network address for communication between IRC bridge and homeserver

Browse source 
This means we need to explicitly specify a `media_url` now,
because without it, `url` would be used for building public URLs to
files/images. That doesn't work when `url` is not a public URL.
This commit is contained in:
Slavi Pantaleev 2019-06-19 09:21:13 +03:00
parent 9b97a42ffb
commit 6b023d09d4
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
roles/matrix-bridge-appservice-irc/defaults/main.yml
View file

@ -8,6 +8,10 @@ matrix_appservice_irc_docker_image_force_pull: "{{ matrix_appservice_irc_docker_
matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc" matrix_appservice_irc_base_path: "{{ matrix_base_data_path }}/appservice-irc"
matrix_appservice_irc_homeserver_url: 'http://matrix-synapse:8008'
matrix_appservice_irc_homeserver_media_url: 'https://{{ matrix_server_fqn_matrix }}'
matrix_appservice_irc_homeserver_domain: '{{ matrix_domain }}'
# Controls whether the matrix-appservice-discord container exposes its HTTP port (tcp/9999 in the container). # Controls whether the matrix-appservice-discord container exposes its HTTP port (tcp/9999 in the container).
# #
# Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:9999"), or empty string to not expose. # Takes an "<ip>:<port>" or "<port>" value (e.g. "127.0.0.1:9999"), or empty string to not expose.
@ -25,8 +29,9 @@ matrix_appservice_irc_systemd_wanted_services_list: []
matrix_appservice_irc_configuration_yaml: | matrix_appservice_irc_configuration_yaml: |
#jinja2: lstrip_blocks: True #jinja2: lstrip_blocks: True
homeserver: homeserver:
url: "https://{{ matrix_server_fqn_matrix }}" url: {{ matrix_appservice_irc_homeserver_url }}
domain: "{{ matrix_domain }}" media_url: {{ matrix_appservice_irc_homeserver_media_url }}
domain: {{ matrix_appservice_irc_homeserver_domain }}
enablePresence: true enablePresence: true
matrix_appservice_irc_configuration_extension_yaml: | matrix_appservice_irc_configuration_extension_yaml: |