mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2024-11-06 02:37:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1399 from borisrunakov/matrix-federation-api-port

Browse Source 
make 8448 configurable instead of hard coded
This commit is contained in:
Slavi Pantaleev 2021-11-15 14:49:14 +02:00 committed by GitHub
commit a536f5764e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/matrix-synapse/defaults/main.yml
View File

@ -27,6 +27,8 @@ matrix_synapse_storage_path: "{{ matrix_synapse_base_path }}/storage"
matrix_synapse_media_store_path: "{{ matrix_synapse_storage_path }}/media-store"
matrix_synapse_ext_path: "{{ matrix_synapse_base_path }}/ext"
matrix_synapse_container_federation_api_port: 8448
matrix_synapse_container_federation_port: 8048
# Controls whether the matrix-synapse container exposes the Client/Server API port (tcp/8008 in the container).

4
roles/matrix-synapse/templates/synapse/homeserver.yaml.j2
View File

@ -269,14 +269,14 @@ default_room_version: {{ matrix_synapse_default_room_version|to_json }}
listeners:
{% if matrix_synapse_metrics_enabled %}
- type: metrics
port: {{ matrix_synapse_metrics_port }}
port: {{ matrix_synapse_metrics_port|to_json }}
bind_addresses:
- '0.0.0.0'
{% endif %}
{% if matrix_synapse_federation_port_enabled and matrix_synapse_tls_federation_listener_enabled %}
# TLS-enabled listener: for when matrix traffic is sent directly to synapse.
- port: 8448
- port: {{ matrix_synapse_container_federation_api_port|to_json }}
tls: true
bind_addresses: ['::']
type: http

2
roles/matrix-synapse/templates/synapse/systemd/matrix-synapse.service.j2
View File

@ -43,7 +43,7 @@ ExecStart={{ matrix_host_command_docker }} run --rm --name matrix-synapse \
-p {{ matrix_synapse_container_client_api_host_bind_port }}:8008 \
{% endif %}
{% if matrix_synapse_federation_enabled and matrix_synapse_tls_federation_listener_enabled and matrix_synapse_container_federation_api_tls_host_bind_port %}
-p {{ matrix_synapse_container_federation_api_tls_host_bind_port }}:8448 \
-p {{ matrix_synapse_container_federation_api_tls_host_bind_port }}:{{ matrix_synapse_container_federation_api_port }} \
{% endif %}
{% if matrix_synapse_federation_enabled and matrix_synapse_container_federation_api_plain_host_bind_port %}
-p {{ matrix_synapse_container_federation_api_plain_host_bind_port }}:{{ matrix_synapse_container_federation_port }} \